removed all floating strings, everything is now being taken from
strings.xml
Merge pull request #158 from colinkho/master

Refactored JSONParser and fixed checkstyle issues.
Added fake spanish strings and fixed bug where non-ascii characters wouldn't work
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
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	src/realtalk/activities/ChatRoomActivity.java
	src/realtalk/util/ChatManager.java
	src/realtalk/util/JSONParser.java
Merge pull request #160 from hazarij/master

Internationalized App
Merged with Jordan's commit. He had an issue with line endings, so ignore whitespace for diffs to work. Also, there was a merge conflict in GCMIntentService, but I think it was caused by the line endings, so I kepy my copy unchanged.
Fixed double-posting bug
finished 'spanish' localization
Merge pull request #162 from CoryShiraishi/master

Localization & bug fixes
generalized message timestamps
Merge branch 'master' of https://github.com/realtalk403/realtalk
Added timeout to prevent infinite server rquests
internationalized message timestamps
Merge pull request #163 from hazarij/master

Internationalized Message Timestamps
added spanish logos
Merge pull request #165 from blee92/master

Added Spanish logos
fixed auto login bug. booyah
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge pull request #164 from joryrice/master

Server connection timeout fix