Just for pull.
Merge branch 'master' of https://github.com/KirMerzlikin/ConferenceApp

Conflicts:
	src/ua/nure/jfdi/conferenceapp/view/MainActivity.java
Just for pull.
Merge branch 'master' of https://github.com/KirMerzlikin/ConferenceApp
Bug fix.