madeActivityAndNotification
Merge branch 'master' into kyky

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	mobile/src/main/java/com/example/alexeenkoff/catchyourroute/MainActivity.java