Merge pull request #2177 from colemanw/master

CRM-13929 - jQuery.files.tpl - update reference to timeentry
Merge pull request #2178 from colemanw/master

CRM-13935 - jQuery.files.tpl - remove reference to mousewheel
CRM-13933 Remove simple search