fix tagmanager
Merge branch 'drole-ngtags' into drole

Conflicts:
	wheelcms_axle/templates/wheelcms_axle/base_admin.html
fix for django 1.5
true fix