Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/doodlelike.iml
	.idea/vcs.xml
	app/controllers/activities_controller.rb
	app/views/activities/_form.html.erb
	app/views/activities/edit.html.erb
	app/views/activities/index.html.erb
	app/views/activities/new.html.erb
	app/views/activities/show.html.erb
	config/routes.rb
	db/migrate/20140522122655_create_activities.rb
	db/schema.rb

-- Hups, da ist was liegengeblieben