Merge branch 'hotfix/0.4.14'
Add missing namespace dir to partial paths
Merge branch 'hotfix/0.4.15'
Merge branch 'hotfix/0.4.15' into dev
Use Unicorn for production with Procfile
bump version
Merge branch 'release/0.4.16'
Rake task to dump users as JSON
Rake task to dump users as JSON
Rake task to dump users as JSON (more efficient)
Merge branch 'hotfix/0.4.18'
Merge branch 'master' into feature/v2-start

Conflicts:
	Gemfile.lock