Updage CHANGELOG
Merge branch 'develop' into release-3.3.2
Update CHANGELOG
Changed typo(?) in install.md

I think you mean to say 'chmod' here to change permissions on smarty3 without changing ownership.
Merge pull request #1248 from kououken/patch-1

Changed typo in install.md
Issue 1234: Add the account name to the notification mails.
Merge pull request #1256 from annando/issue-1234

Issue 1234: Add the account name to the notification mails
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
Merge branch 'release-3.3.2'
merge changelist.txt into CHANGELOG
Update version in boot.php
Merge branch 'master' into develop
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items