added search icon
added id to search icon
removed old search icon
Merge branch 'master' into styling2
finished styling trip/marker/user edit pages