Support 1.4.7
Merge branch 'master' of github.com:alfg/AdminCraft

Conflicts:
	admincraft/templates/tabs.html
	admincraft/views.py