1
Merge branch 'master' of https://github.com/heweitykc/Calabash-Brothers

Conflicts:
	project3/cocoproj/armature1/Backup/20140921 004312/armature1.json
	project3/cocoproj/armature1/Backup/20140921 004812/armature1.json
	project3/cocoproj/armature1/Backup/20140921 005312/armature1.json
	project3/cocoproj/armature1/Backup/20140921 005812/armature1.json
	project3/cocoproj/armature1/Backup/NormalCloseTag.xml
	project3/cocoproj/armature1/Json/armature1.json