Added search form (just layout)

- Grouped country and city drop down lists as a separate user control
Merge remote-tracking branch 'origin/master'