added tests for CreateRoomActivity
Merge branch 'master' of https://github.com/realtalk403/realtalk
Added stub test for UserManager

Added stub that still fails test (that's okay, because it's a stub).
Merge pull request #133 from colinkho/master

Fixing Jenkins
Merge pull request #134 from colinkho/master

Fixing Jenkins
Added SHA hashing for passwords
Merge branch 'master' of https://github.com/realtalk403/realtalk
Anonymous login
Added emoticon feature and a beep sound effect for when new messages are received
Fixed bug where disconnecting from the network would crash the app
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/values/strings.xml
	src/realtalk/activities/ChatRoomActivity.java
	src/realtalk/activities/CreateRoomActivity.java
	src/realtalk/activities/LoginActivity.java
	src/realtalk/activities/SelectRoomActivity.java
Added Stub ChatController

Also added IChatController interface
Merge pull request #136 from taylorsw/master

Stub class for ChatManager
Fixed another bug where being disconnected would crash the app
Moved a string to strings.xml
Location persists until stale

Stores user location until updated by listener, removes constant "geo
fix" commands.
Merge pull request #138 from taylorsw/master

Location Persists for five minutes
Merge branch 'master' of https://github.com/realtalk403/realtalk
removed broken test