UI changes
chatroomactivitytest
Merge branch 'master' of https://github.com/realtalk403/realtalk
small changes
Merge branch 'master' of https://github.com/realtalk403/realtalk
small changes
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/values/strings.xml
	src/realtalk/activities/ChatRoomActivity.java
	src/realtalk/activities/CreateRoomActivity.java
test
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/values/strings.xml
	src/realtalk/activities/ChatRoomActivity.java
	src/realtalk/activities/SelectRoomActivity.java
finished activity test
Merge pull request #146 from hazarij/master

Added Activity test for ChatRoomActivity, other small changes
Merge pull request #145 from blee92/master

Added checker for length of Room Name/Description
Account Settings test