Merge branch 'hotfix/0.0.1.1'
don't error out if the root of a reshare of a reshare got deleted, fixes #3546
Merge branch 'hotfix/3546-reshare'
bump version to 0.0.1.2
changelog update before release
Merge branch 'release/0.0.2.0'

Conflicts:
	Changelog.md
	config/defaults.yml
Add progress percentage to upload images
Merge pull request #3740 from movilla/progress_upload

Add progress percentage to upload images. Close #3633
Mark all unread post-related notifications as read, if one of this gets opened
Merge pull request #3787 from movilla/notications_all

Mark all unread post-related notifications as read, if one of this gets opened. Close #3665
Show error and flash-notice when sending messages to non contacts
Merge pull request #3723 from movilla/notice_conversations

Show error and flash-notice when sending messages to non contacts
fix regression in 0.0.3.0 (close #3805)
re-add hovercards

* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
Merge pull request #3802 from Raven24/hovercards

Bring back the hovercards... backbone style
Load the entire lib folder refactor.
Removed hack, replaced with a proper solution.
Merge pull request #3809 from archSeer/patch-1

Load the entire lib folder redux.
display hovercards in reshares and on the linked name
hovercards everywhere (comments, likes, top left sidebar stream summary thingy...)

Say a word if you think it's getting too much...
Bump to Rails 3.2.10 as per CVE-2012-5664

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