added notifications on all pages
Merge branch 'master' into simon
merge master to simon