Merge pull request #39 from dupps/master

Module Templates
Merge pull request #6 from cbos-team/master

Module Templates
Merge pull request #41 from dupps/master

restore error messages
Merge pull request #7 from cbos-team/master

hotfix error messages
fix update user and admin main page
Merge branch 'master' of https://github.com/KevinHuebner/cbos
Merge pull request #42 from KevinHuebner/master

Fix update user and admin page list
Merge pull request #3 from cbos-team/master

fix admin page