Translatable strings in users
More spanish translations
Make 'Root' untranslatable
Merge branch 'translate' of github.com:carlosleopoldo/bolt into carlosleopoldo-translate

Conflicts:
	app/src/Bolt/Permissions.php
	app/view/users.twig
Merge branch 'translate' of github.com:carlosleopoldo/bolt

Conflicts:
	app/src/Bolt/Permissions.php
	app/view/users.twig
Merge branch 'carlosleopoldo-translate'
Keep 'username' around in the content-type tables. For now at least. Hopefully fixes #766.
Remoced 'level' from users screen. Properly display roles. Fixes #764.
requireUserLevel() -> requireUserPermission(). Closes #760.
Bumping version number to "1.4 beta"
Keep 'fallback' for update vs. insert working with Changelog.
Working on option to _not_ fetch relations and taxonomies for content. Work in progress..
Today was a good day. I deleted 150 lines of code.
Tweaking ImportWXR
Importing Categories as well.
Tweaking import of categories.
Initial Norwegian Bokmål translation for messages in Bolt 1.3.1.
Merge remote-tracking branch 'upstream/master' into norwegian-translation
Merge pull request #1 from bolt/master

Merge with HEAD
Merge pull request #768 from hansfn/norwegian-translation

Initial Norwegian Bokmål translation for messages in Bolt 1.3.1.