Downgrade rails version
Wut?
Merge branch 'master' of https://github.com/theodi/dapaas-frontend

Conflicts:
	Gemfile
Thin