Merge branches 'develop' and 'advancedsearch'
Merge branch 'release/2.0.1'
fixed issue with browser trying to load bootstrap timepicker css externally
Merge branch 'hotfix/bootstrap_timepicker' into develop