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'
Merge branch 'hotfix/0.0.2.1' into develop

Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
add Armenian pluralization rule
Update and refactor default public view, close #3811
Merge pull request #3813 from Flaburgan/feature/3811-update-and-refactor-default-public-view

Feature/3811 update and refactor default public view
add clarifying message to install script (+ fix typo) [ci skip]
bump Rails to 3.2.11

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/
Merge branch 'hotfix/0.0.2.2' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
remove merge conflict marker
add images to notifications
Merge pull request #3821 from diasp/feature/notification-images

Add images to notifications
fix issue #3671 reshare a post multiple times
update changelog