Adds theme support
Merge branch 'themes'

Conflicts:
	magpie/template/base.html