grouping by rows
Merge branch 'develop' of github.com:TheConstructors/QwikStubs into develop

Conflicts:
	app/models/event.rb