reg
Merge branch 'master' of https://github.com/stefanNaumov/FredFlintstone

Conflicts:
	app/src/main/java/activities/RegisterEventActivity.java
Merge branch 'master' of https://github.com/stefanNaumov/FredFlintstone

Conflicts:
	.idea/modules.xml
	app/app.iml
Merge branch 'master' of https://github.com/stefanNaumov/FredFlintstone
started events custom grid view