Fixed comments, more todo's with settings, and some layout issues
Merge branch 'master' of https://github.com/MadMikeyB/MPress

Conflicts:
	.gitignore