Commit
Merge branch 'master' into admin

Conflicts:
	admin/dashboard.html