Merge branch 'hotfix/0.0.3.3'
bump rails to 3.2.13, release 0.0.3.4
Merge branch 'hotfix/0.0.3.4' into develop

Conflicts:
	Changelog.md
	config/defaults.yml