added tests for CreateRoomActivity
Merge branch 'master' of https://github.com/realtalk403/realtalk
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

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
Fixed another bug where being disconnected would crash the app
Moved a string to strings.xml
Merge branch 'master' of https://github.com/realtalk403/realtalk
removed broken test
Merge pull request #139 from CoryShiraishi/master

Added Emoticons, sounds, and fixed some connectivity bugs
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/values/strings.xml
	src/realtalk/activities/ChatRoomActivity.java
	src/realtalk/activities/CreateRoomActivity.java