sqlite proble
Merge https://github.com/nicolasbonnetdu13/bonnet_nicolas

Conflicts:
	config/database.yml