Added License notice to base template file.
Merge branch 'master' of git://github.com/samolds/spacescout_admin into samolds
Merge branch 'master' of git://github.com/swansong/spotseeker-admin into jswan2
on batch spot PUTs, spot images are no longer touched (POSTed)

fixes SPOT-621
Merge branch 'spot621'
Basic scrolling capability for upload page errors and warnings
Merge branch 'master' into scrollupload
SPOT-711: Functional fix for overflowing tables of upload errors