Merge branch 'master' of github.com:SlideAtlas/SlideAtlas-Server
Fix for Wash. U. text annotation bug (arrow in the wrong position).
WIP: session cleanup
Make Collection's image_store required, as it's used by attachment upload
Merge branch 'session-cleanup'

* session-cleanup:
  Make Collection's image_store required, as it's used by attachment upload
  WIP: session cleanup
Merge branch 'master' of github.com:SlideAtlas/SlideAtlas-Server

Standard merge
Progress made on iPad textwidget positioning bug
Fixed conflicts
Stack bugs.  Name changes in textWidget (did it fix the arrow problem or was it already fixed?)
Merge branch 'master' of github.com:SlideAtlas/SlideAtlas-Server
Merge branch 'master' of github.com:SlideAtlas/SlideAtlas-Server

Standard merge
Merge branch 'master' of github.com:SlideAtlas/SlideAtlas-Server

Standard merge
Merge branch 'preston-panning'

* preston-panning:
  Save for merge
  Fixed 'unexpected end of input' bug
  Text widget using div overlay
  Added code that uses the arrow keys to pan the viewer, and an incomplete dialog widget

Adding panning feature to master branch
Merge branch 'master' of github.com:SlideAtlas/SlideAtlas-Server
Drawn copyright, and IIP server option.
Merge branch 'iip'

* iip:
  Drawn copyright, and IIP server option.