Merge pull request #1045 from anilgooru/dev-branch

Added new 404 html file.
Implemented : Add OER Tag in search results
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: