* 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.

From a quick look at the for us available databases this was not actually used in the wild.

http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/

see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/

https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53

Conflicts:
	Changelog.md
	config/defaults.yml

add x-frame headers

Fix notifications for private messages between local users, fixes #2321

3682 fix padlock images

... and force it to really remember the session by a hidden field.

fix css error with intivation people block in search results

Update gems