Switching sqlite to pg
Merge branch 'develop'