s
Merge branch 'master' of https://github.com/bartosmarcin/komunikator.git

Conflicts:
	src/com/example/komunikator/ConversationActivity.java
Dość teoretyzowania