update
Merge branch 'master' of https://github.com/sitefeng/Space7

Conflicts:
	Space7/GameSceneLayer.m
conflictresolution