update
Merge branch 'dev' of http://github.com/DragonBones/SkeletonAnimationLibrary into dev

Conflicts:
	src/dragonBones/animation/AnimationState.as
	src/dragonBones/animation/TimelineState.as
	src/dragonBones/core/DragonBones.as
	src/dragonBones/objects/AnimationData.as
	src/dragonBones/objects/ObjectDataParser.as
	src/dragonBones/objects/TransformFrame.as
	src/dragonBones/objects/XMLDataParser.as
update