Merge branch 'master' into sso

Conflicts:
	db/schema.rb