Добавил работу с сетью. 070814
Merge branch 'benzoback' of https://github.com/WinterBall/ChatApplication into PavBranch

Conflicts:
	app/src/main/res/layout/activity_settings.xml
у
Merge remote-tracking branch 'origin/PavBranch' into PavBranch

Conflicts:
	app/src/main/res/layout/activity_settings.xml
Merge pull request #31 from PaVM/PavBranch

Pav branch
Ev_Pav
Merge pull request #33 from WinterBall/benzoback

подкрутил цвета + исправил тему в окне about
Почти все закончено, кроме AsyncTask<>
изменил Nightmode
test
Merge branch 'test' of https://github.com/zer969696/ChatApplication into master_local
Merge branch 'back_test' of https://github.com/WinterBall/ChatApplication into master_local
Merge pull request #35 from PaVM/PavBranch

Pav branch
Все сделано, кроме серверной части и получения
test
Merge pull request #36 from PaVM/PavBranch

Pav branch 10.08.14 0:27
Merge branch 'PavBranch' of https://github.com/WinterBall/ChatApplication into master_local
test
upd
upd