ChatRoomActivityTest set with a longer timeout
Refactored JSON parser
Merge branch 'master' of https://github.com/colinkho/realtalk
Merge branch 'master' of https://github.com/realtalk403/realtalk
Fixed Checkstyle warnings
Added Author comments to HttpUtility
Removed depreciated JsonParser God Method and updated test to use new Json Parser
Merge pull request #158 from colinkho/master

Refactored JSONParser and fixed checkstyle issues.
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	src/realtalk/activities/LoginActivity.java
	src/realtalk/asynctasks/Authenticator.java
	src/realtalk/asynctasks/PwordChanger.java
	src/realtalk/asynctasks/RoomCreator.java
	src/realtalk/asynctasks/RoomJoiner.java
	src/realtalk/asynctasks/UpdateRegId.java
	src/realtalk/asynctasks/UserAdder.java
	src/realtalk/asynctasks/UserRemover.java