Merge branch 'hotfix/advanced_search_class_id'
Merge branch 'develop'
switching development/test to postgres #23