Merge branch 'master' of https://github.com/UMInteractive/cinema_game

Conflicts:
	UI Design/new loading image/Loading Image for iPhone 5.png
	UI Design/new loading image/Portraint 640*1136.png
	UI Design/new loading image/Portrait 750*1334.png
	UI Design/new loading image/default5.png
new stuff
Merge branch 'master' of https://github.com/UMInteractive/cinema_game