Moved alpha branch to point to alpha server

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

Alpha
Set up manifest for GCM
App now registers correctly with GCM
Refined LoginActivity for GCM
Merged gcm with latest pull
added model classes ChatRoomModel and HallwayModel
Added test project and build.xml files to the main project and test
project. Created a stub test for ChatRoomModel.
Merge pull request #79 from blee92/master

Auto login, Account Settings page, Logout
leave room button
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/values/strings.xml
Removed Whitespace on GCMIntentService.java
Merged Files
Editted HallwayModel.java to fail jenkins tests. Will Undo edits after it fails
Undoing changes to HallwayModel.java that failed jenkins tests
updated tests/build.xml to support jUnit failures
Merge pull request #78 from CoryShiraishi/master

Model Classes / tests project
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge branch 'master' of https://github.com/realtalk403/realtalk