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

Conflicts:
	app/app.iml
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/strings.xml