Merge branch 'master' into projects

Conflicts:
	app/controllers/search_controller.rb
	app/models/user.rb
	db/structure.sql
Merge branch 'projects' into projects-second

Conflicts:
	app/controllers/search_controller.rb
	app/models/user.rb