removed SLICK extensions - we don't want blocking database calls
Merge branch 'develop'