added selectRoomActivity and ChatRoomActivity
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/realtalk/activities/MainActivity.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/realtalk/util/Message.java
Merge branch 'master' of https://github.com/realtalk403/realtalk
updated chatroom ui
updated chatroom ui
updated chatroom ui
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml
	src/realtalk/activities/MainActivity.java
Merge pull request #37 from colinkho/master

Set Up Alpha release document directory and added UML Diagrams
Added UML server class diagram
removed duplicate files
Merge pull request #38 from joryrice/master

Added UML class diagram for server-side code
Added rooms list and chatroom UI.
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge pull request #39 from hazarij/master

Added view rooms and chatroom UI
Fixed clickable message items
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge pull request #43 from colinkho/master

Updated UML Sequence Diagrams
Fixed clickable listview bug
Merge pull request #44 from taylorsw/master

Fixed clickable listview bug