Installed sqlite3 on development server
Fixed database.yml
Merge remote-tracking branch 'upstream/master'