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
Bump to Rails 3.2.10 as per CVE-2012-5664

https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
Merge branch 'hotfix/0.0.2.1' into develop

Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml