Merge branch 'master' of github.com:nla/banjo
Merge branch 'bs-dsc-517-multiple'
Merge branch 'master' of github.com:nla/banjo
Merge branch 'master' of github.com:nla/banjo
merged changes
Change all tabs to spaces for consistancy.
Merge pull request #622 from nla/acm-fix-bulk-formatting

Change all tabs to spaces for consistancy.
Merge branch 'master' of github.com:nla/banjo
IE browser detection and warning added.
Remove unneeded security settings.

This fixes a bug where you could get mini-login screen embedded in forms.
Merge pull request #624 from nla/bug/acm-dsc-581

Remove unneeded security settings.
add info on emails to the upload message
Merge branch 'master' into js-bugfix
Merge pull request #625 from nla/js-bugfix

Js bugfix
Merge pull request #623 from nla/bs-dsc-587-browser

Bs dsc 587 browser
updated to latest amberdb version.
Merge branch 'master' into ti_search_fixes