fixes for new server
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	Gemfile.lock