alert fix and remove some non functional macros
notes deleted from devices drop down
Merge branch 'master' into bulkEdit-dsc-379
remove comments
remove comments
Add lookup for tools for Devices and Software on Search.
Merge pull request #553 from nla/bs-dsc-449-devices

notes deleted from devices drop down
Merge pull request #554 from nla/bulkEdit-dsc-379

Bulk fix issue with alert message
Merge pull request #555 from nla/ti_search_changes

Add lookup for tools for Devices and Software on Search.
Bulk Edit fix. View Children fix

Signed-off-by: mossrocket <peter@mossrocket.com>
Merge branch 'master' of https://github.com/nla/banjo

Signed-off-by: mossrocket <peter@mossrocket.com>

Conflicts:
	web/WEB-INF/views/bulkEdit/macros.ftl
Merge remote-tracking branch 'origin/master' into dsc-504