Bugfix: default content licenses weren't getting set correctly.
Made sure new users land on the page they were trying to access.
Merge branch 'master' into i18n

Conflicts:
	app/views/shared/_license_form.html.erb
	app/views/users/edit.html.erb