Implemented making time search optional
Changed SearchActivity
Fixed up merge problems in SearchActivity