Actually changes to support Local Notification
Merge branch 'develop2' into dev/remove_game_references