no message
Merge branch 'master' into admin

Conflicts:
	lib/tasks/sample_data.rake
	spec/factories.rb