Re-added message function in search template
Sorted out attached objects on file page
Merge branch 'dev' into test