Merge branch 'master' of https://github.com/realtalk403/realtalk
Fixed clickable message items
Merge branch 'master' of https://github.com/realtalk403/realtalk
Updated everything to use UserInfo instead of User
Merge pull request #46 from taylorsw/master

Updated everything to use UserInfo instead of User
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	src/realtalk/activities/ChatRoomActivity.java
Added javadoc for chatroomactivity