Merge branch 'master' into angular

Conflicts:
	app/models/permitted_params.rb