4
Merge branch 'master' of https://github.com/TaniaSPK/hq

Conflicts:
	spec/models/event_spec.rb