Merge branch 'refs/heads/master' into release
Translated user profile editor screens.
Dropped profile navigation extension in config
Updated user module dependency
Merge branch 'refs/heads/beta6' into release

Conflicts:
	composer.json
Rollback to dev-master dependencies
Merge branch 'refs/heads/release'