PockEvent
Merge branch 'master' of https://github.com/cherhan/eventcompass

Conflicts:
	app/app.iml
	app/build.gradle