precompile Assets
add player
precompile Assets
Merge branch 'development'

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate