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

Conflicts:
	Gemfile.lock