move languages string to localisation object
drop language field
more tests
remove site from CategoryAdmin
Merge branch 'feature/issue-19-specify-category-ordering' into develop
Merge branch 'develop' of github.com:praekelt/unicore-cms-django into feature/issue-14-allow-import-git-to-db

Conflicts:
	cms/tests.py