Merge branch 'trans' of http://github.com/TheBB/aligulac into trans

Conflicts:
	locale/no/LC_MESSAGES/django.po
Merge branch 'trans' of http://github.com/TheBB/aligulac into trans

Conflicts:
	locale/no/LC_MESSAGES/django.po