some light changes
Merge branch 'master' of
https://github.com/KirMerzlikin/ConferenceApp.git

Conflicts:
	src/ua/nure/jfdi/conferenceapp/view/MainActivity.java
ConnectionController was integrated
Merge branch 'master' of
https://github.com/KirMerzlikin/ConferenceApp.git

Conflicts:
	src/ua/nure/jfdi/conferenceapp/view/MainActivity.java