settings page support
Merge branch 'master' of https://github.com/losogithub/mtm

Conflicts:
	views/layout.html