ref proj
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/MainLayer.cpp
	Classes/PlistReader.cpp
	Classes/PlistReader.h