the dev branch
Merge branch 'dev' into dev-with-bugs

Conflicts:
	QingChunApp.xcodeproj/project.pbxproj