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

Conflicts:
	app/app.iml
	app/build.gradle
Manifest commits for the ui
final!
Merge remote-tracking branch 'remotes/origin/master' into slave

Conflicts:
	.idea/modules.xml
	EventCompass.iml
	Parse-1.6.0/Parse-1.6.0.iml
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/eventcompass/cherhan/eventcompass/MainActivity.java
	eventcompass.iml
final
final