Fixed a game over scene bug, added popup alert when game saved from e-mail
Merge remote-tracking branch 'origin/master'
Fixed some conflict errors
Merge remote-tracking branch 'origin/master'