Moved alpha branch to point to alpha server

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

Alpha
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
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.
merged with upstream
Merge pull request #99 from CoryShiraishi/master

Added Model Tests
Added test for ChatController
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge pull request #100 from joryrice/master

Some tests
Merge pull request #101 from taylorsw/master

GPS Support (finished for Beta)
Fixed bug and added toast

Best with strawberry jelly