Merge branch 'develop' of https://github.com/TheConstructors/QwikStubs into search

Conflicts:
	app/models/event.rb
Merge branch 'search' of https://github.com/TheConstructors/QwikStubs into search

Conflicts:
	app/models/event.rb