sync
Merge branch 'master' of https://github.com/SSinC/PicturesqueScene

Conflicts:
	PicturesqueScene/ViewController.m