Don't rewrite assets
Merge branch 'master' into develop
Revert abinrax changes
Revert more erroneous merge problems
Search form: matched height of text input to height of search button
Remove unused file
Merge branch 'develop' into feature/front-end-rewrite