Merge branch 'master' of github.com:goFrendiAsgard/No-CMS into development
Merge branch 'development' of github.com:goFrendiAsgard/No-CMS into development
fix one bug