Merge branch 'new_search' of https://github.com/DemSantes/sharethetravel into new_search
Merge branch 'new_search' of https://github.com/DemSantes/sharethetravel into new_search
Merge branch 'new_search' of https://github.com/DemSantes/sharethetravel
Edit search
Merge branch 'new_search' of https://github.com/DemSantes/sharethetravel into new_search
added styles for buttons and search form
Merge branch 'master' of https://github.com/DemSantes/sharethetravel
Merge branch 'new_search'

Conflicts:
	sharethetravel/sharethetravels/templates/account.html
	sharethetravel/sharethetravels/templates/base.html
	sharethetravel/sharethetravels/templates/search.html
Merge branch 'master' of https://github.com/DemSantes/sharethetravel
Search results interface