Merge branch 'master' into google_apps

Conflicts:
	app/models/user.rb