Merge branch 'master' of https://github.com/grenkaDmytrenko/shouldGo

Conflicts:
	app/src/main/java/com/shouldgo/ui/event/BaseEventFragment.java
	app/src/main/java/com/shouldgo/ui/event/update/UpdateEventFragment.java