refactored notifications to draw from different data
Merge branch 'develop' of https://github.com/ARISGames/iOSClient into develop