Migrating to pg
Merge branch 'master' of ssh://app.exo.io/repository

Conflicts:
	Gemfile
	Gemfile.lock