Merge branch 'master' into develop
Bug fixed for event history scrolling, all times modified to UTC, Notification for subscribers with new event added
Merge branch 'develop'