Zamawianie dan.
Merge branch 'master' into pablo

Conflicts:
	app/views/events/show.html.haml