template clean up
Merge branch 'master' of github.com:webstrap/amazine
improved userMenu