Merge branch 'master' into frp

Merge conflicts:
	src/ua/kpi/teacherjournal/MainActivity.scala