some bugs
test project
Merge branch 'master' of ssh://git@github.com/Slwhnds/sr_client.git
bla
conflict solved
bla
bla
Merge branch 'master' of ssh://git@github.com/Slwhnds/sr_client.git

Conflicts:
	BlogClient/bin/classes/petrsu/smartroom/android/blogclient/BlogErrDialog.class
	BlogClient/bin/classes/petrsu/smartroom/android/blogclient/BlogListActivity.class
	BlogClient/bin/classes/petrsu/smartroom/android/blogclient/R$string.class
	BlogClient/bin/classes/petrsu/smartroom/android/blogclient/R$style.class
	BlogClient/src/petrsu/smartroom/android/blogclient/BlogListActivity.java
	CameraClient/bin/classes/petrsu/smartroom/android/cameraclient/CameraListActivity.class
актуальная версия логики