fix conflicts and datepicker issue
Merge branch 'quesks-I-112941-challenge-advance-search-get-not-post' into quesks