Moved alpha branch to point to alpha server

For Alpha turn-in
Renamed MainActivity
Merge pull request #54 from taylorsw/alpha

Alpha
Merge pull request #91 from colinkho/master

Added JUnit for testing and fixed AutoTextView so that it passes checkstyle + Updated ChatController
Added test for PullMessageResultSet
UserInfo test
Merge pull request #92 from taylorsw/master

UserInfo + PullMessageResultSet Tests
Merge pull request #93 from colinkho/master

Added White Box test for ChatRoomInfo
JSONParser Test
Merge pull request #95 from taylorsw/master

JSONParser Test
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	src/realtalk/activities/LoginActivity.java
	src/realtalk/util/ChatManager.java
Merge branch 'master' of https://github.com/realtalk403/realtalk
separated joined/unjoined rooms in SelectRoomActivity
separated joined/unjoined rooms in SelectRoomActivity
Added ChatManagerTest

Mostly tested ChatManager
Changed import statements (cleanup)
Merge pull request #98 from taylorsw/master

ChatManager Test
Merge pull request #97 from hazarij/master

Changed Layout of SelectRoomActivity
Added tests for ChatRoomResultSet and RequestResultSet
Merge branch 'master' of https://github.com/realtalk403/realtalk
Finished tests for HallwayModel and ChatRoomModel. Changed ChatRoomModel.removeRoom to .fRemoveRoom and updated references. Renamed model tests.