frontend
Merge branch 'master' of https://github.com/rollstudio/djangodash-2013

Conflicts:
	templates/base.html