deleting obsolete files
Merge branch 'master' of github.com:Christianmo/cms
setup