Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948

From a quick look at the for us available databases this was not actually used in the wild.
Merge branch 'hotfix/0.0.2.4'
Update .travis.yml
merge master
Merge branch 'despora' of github.com:prellele/diaspora into despora
* Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58)
* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
Merge branch 'hotfix/0.0.2.5'
Merge branch 'master' of git://github.com/diaspora/diaspora
Merge branch 'master' into despora

Conflicts:
	.travis.yml
merge conflicts