Added SHA hashing for passwords
Merge branch 'master' of https://github.com/realtalk403/realtalk
Anonymous login
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 pull request #140 from taylorsw/master

Fixed FindBugs bug
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 delay for test
Merge pull request #141 from blee92/master

Added delay for Jenkins test
Hashing passwords and push notifications
Removed commented out code
Merge pull request #142 from CoryShiraishi/master

Removed commented out code
merged conflicts
Merge branch 'master' of https://github.com/realtalk403/realtalk
Added Mock Tests for ChatController