Merge branch 'master' of github.com:ericburley-wf/bigsky into BOOKS-2539

Conflicts:
	templates/django/books/app.html
Merge branch 'master' of github.com:ericburley-wf/bigsky into BOOKS-2539

Conflicts:
	templates/django/books/app.html
Merge branch 'master' of github.com:ericburley-wf/bigsky into BOOKS-2539

Conflicts:
	templates/django/books/app.html
BOOKS-2287 Added CSS to sorting
BOOKS-2185 removing unused modal partials / directives

we haven't used these in probably 6 months…
BOOKS-2185 removing unused modal partials / directives

we haven't used these in probably 6 months…
BOOKS-2287 resolving merge conflicts
BOOKS-2287 resolving merge conflicts
BOOKS-2287 resolving merge conflicts
BOOKS-2185 updating all modals to use new web-skin spec
BOOKS-2185 tightening up the document selection modal

for use with new inherited web-skin patterns
Merge remote-tracking branch 'origin/master' into editor_reskin/BOOKS-2185_mainline
Merge remote-tracking branch 'origin/master' into editor_reskin/BOOKS-2185_mainline
Merge remote-tracking branch 'origin/master' into editor_reskin/BOOKS-2185_mainline
Merge branch 'upstream_master'

Conflicts:
	apps/doc_viewer/.gitignore
	apps/viewer/api/toc.py
	apps/viewer/api/viewer_structure.py
	apps/viewer/html_canvas_writer.py
	apps/viewer/tests/unit/test_canvas_draw_builder.py
	rest_services_main.py
Merge branch 'upstream_master'

Conflicts:
	apps/doc_viewer/.gitignore
	apps/viewer/api/toc.py
	apps/viewer/api/viewer_structure.py
	apps/viewer/html_canvas_writer.py
	apps/viewer/tests/unit/test_canvas_draw_builder.py
	rest_services_main.py
Merge branch 'upstream_master'

Conflicts:
	apps/doc_viewer/.gitignore
	apps/viewer/api/toc.py
	apps/viewer/api/viewer_structure.py
	apps/viewer/html_canvas_writer.py
	apps/viewer/tests/unit/test_canvas_draw_builder.py
	rest_services_main.py
Merge branch 'master' of github.com:shanesizer-wf/bigsky

Conflicts:
	apps/viewer/html_canvas_writer.py
Merge branch 'master' of github.com:shanesizer-wf/bigsky

Conflicts:
	apps/viewer/html_canvas_writer.py
Merge branch 'master' of github.com:shanesizer-wf/bigsky

Conflicts:
	apps/viewer/html_canvas_writer.py