final commit of course
Merge branch 'dev' of https://github.com/yangsiy/Plask into dev

Conflicts:
	app/templates/base.html