leave room button
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/values/strings.xml
Merge branch 'master' of https://github.com/realtalk403/realtalk
ui changes
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	src/realtalk/activities/SelectRoomActivity.java
Merge pull request #83 from colinkho/master

Implemented GCM + cleaned up package names + modified activities to use gcm
UI changes
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	src/realtalk/activities/ChatRoomActivity.java
Merge pull request #84 from colinkho/master

Added Testing framework for Jenkins.
UI changes, added room details button
UI changes
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge pull request #86 from colinkho/master

Added FindBugs + corrected files based on findbugs findings
Merge pull request #87 from colinkho/master

Edited build.xml so that findbugs does not fail the build for warnings
Merge branch 'master' of https://github.com/realtalk403/realtalk
Updated build.xml to handle checkstyle. Included checkstyle lib. Editted realtalk_styles.xml. Modified src files to comply with checkstyle feedback.
merged with upstream
Merge pull request #89 from CoryShiraishi/master

Implemented Checkstyle for jenkins and updated files based on checkstyle feedback
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	src/realtalk/activities/SelectRoomActivity.java
Merge pull request #90 from hazarij/master

UI changes, Ability to view Room Details, Ability to Leave Room