templateing for menu + minor changes + db file
Merge branch 'master' of https://github.com/tuur29/cms