set development database to sqlite3
Merge branch 'master' into sqlite_devolopment

Conflicts:
	Gemfile