Set-up EasyMock Framework
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
Added Mock Tests for ChatController
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge pull request #143 from joryrice/master

Version 1 Additional Features
Fixed CreateAccountRoom.java
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge pull request #144 from CoryShiraishi/master

Fixed Create Account Bug
Deleted UserManagerTest.java
test
Merged Files
Added checker for Room Name length and Description length
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