Merge branch 'develop'
update noticication text
Merge branch 'master' of github.com:Senorsen/SenorCMS
Merge branch 'develop'