merge bugs
Merge branch 'master' into develop
working on new UI (SearchBuilder)
Bug fixes
Merge branch 'develop'