Merge pull request #52 from mmacaula/searchui2-aviture

Merged query and scrollbar updates
Merge pull request #53 from mmacaula/searchui2-aviture
Merge pull request #54 from mmacaula/searchui2-aviture
DDF-231 - fixed issue with query form not re-selecting options after returning from list view
DDF-231 - fixed margin after tabs
Merge remote-tracking branch 'ddf-origin/searchui2' into searchui2-aviture

Conflicts:
	ui/search-ui/mapsearch/src/main/webapp/templates/searchForm.handlebars