Merge branch 'hotfix/0.0.2.1'
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
fix after sign-up popups overlaping header
fix .popover overlapping header
Merge pull request #3831 from marpo60/fix-reshare

Remove the 'Reshare' link on posts if the user has already reshared the post, and displays an error in case a user tries to reshare a post they have already reshared.
Merge pull request #3834 from asphxia/3833-popups-overlap-header

Fix popovers overlapping the header topbar on scroll.
Issue #3837: Hovercard causes horizontal scrollbar to appear
Merge pull request #3839 from asphxia/feature/3837-hovercard-causes-horizontal-scrollbar

Hovercard no longer causes horizontal scrollbar to appear. Fixes #3837.
pod version in footer and updated link to changelog #3705
Merge pull request #3822 from diasp/feature/3705-pod-version

Show pod version in footer #3705
Write unicorn stderr and stdout log
Merge pull request #3785 from diasp/feature/unicorn-log

Write unicorn stderr and stdout
Add Aspect model and collection to backbone
Add aspect_view