Line settings
Merge branch 'master' of https://github.com/mrgn/mowt

Conflicts:
	mowt/templates/mowt/base.html