merge success
Merge remote-tracking branch 'upstream/master'
Fixed merge trackings
Merge pull request #44 from robinbattle/master

Fixed notification pages and tweaks