Merge branch 'hotfix/v0.1.0.1'
Merge branch 'release/0.1.1.0'
Merge branch 'release/0.2.0.0'
bump recommended Ruby version 1.9.3-p484
bump Rails to version 3.2.16
Fix path ignores in .gitignore to not ignore files inside the paths, but to ignore the path itself. Otherwise git clean -fd is scary as it says its removing them even if not
Merge pull request #4617 from jaywink/fix-gitignore-paths

Fix path ignores in .gitignore
bump to 0.2.0.1
Merge branch 'release/0.2.0.1' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
fix i18n fallback after i18n update