Update for migrated server
Fix merge

Conflicts:
	Gemfile