Moving sqlite3 gem under development group because Heroku complains
Merge branch 'master' of github.com:Reformation/erp

Conflicts:
	Gemfile
	Gemfile.lock
Renaming config settings name