fix in ChatActivity
Merge branch 'part2' of https://github.com/mjohenneken/SimpleAndroidChat into part2
Merge branch 'part1' into part2
Merge branch 'part2'

Conflicts:
	src/com/anderscore/simpleandroidchat/ChatActivity.java
fixes in DB and ChatActivity
Merge branch 'part1' into part2
Merge branch 'part2' into part3

Conflicts:
	src/com/anderscore/simpleandroidchat/ChatActivity.java
Minor Fix
Merge branch 'part1' into part2
Merge branch 'part2' into part3

Conflicts:
	src/com/anderscore/simpleandroidchat/ChatActivity.java
Merge branch 'master' of https://github.com/mjohenneken/SimpleAndroidChat