bin
Merge branch 'master' of https://github.com/aram-hakobyan/testrep

Conflicts:
	ConferenceHermes/bin/ConferenceHermes.apk
	ConferenceHermes/bin/dexedLibs/google-play-services_lib-390a1956151316e6b582af8f7bc1bead.jar
	ConferenceHermes/bin/resources.ap_
	google_play_services/libproject/google-play-services_lib/bin/google-play-services_lib.jar
Bugfixes.
Mobile displays support.