rolling back to sqlite3
Merge branch 'master' of github.com:Bionexo/pharos180

Conflicts:
	Gemfile