fixes in DB and ChatActivity
Merge branch 'part1' into part2
Minor Fix
Merge branch 'part1' into part2
Merge branch 'part2' of https://github.com/mjohenneken/SimpleAndroidChat into part2