Merge branch 'origin/master'

spine-as3/spine-as3/src/spine/Skeleton.as

@@ -35,10 +35,10 @@ public class Skeleton {
 	internal var _slots:Vector.<Slot>;
 	internal var _drawOrder:Vector.<Slot>;
 	internal var _skin:Skin;
-	public var r:int = 1;
-	public var g:int = 1;
-	public var b:int = 1;
-	public var a:int = 1;
+	public var r:Number = 1;
+	public var g:Number = 1;
+	public var b:Number = 1;
+	public var a:Number = 1;
 	public var time:Number;
 	public var flipX:Boolean;
 	public var flipY:Boolean;

spine-csharp/src/Skin.cs

@@ -45,7 +45,7 @@ namespace Spine {
 
 		public void AddAttachment (int slotIndex, String name, Attachment attachment) {
 			if (attachment == null) throw new ArgumentNullException("attachment cannot be null.");
-			attachments.Add(new KeyValuePair<int, String>(slotIndex, name), attachment);
+			attachments[new KeyValuePair<int, String>(slotIndex, name)] = attachment;
 		}
 
 		/// <returns>May be null.</returns>