slider box formatting
Merge branch 'master' of github.com:acardona/CATMAID

Conflicts:
	django/applications/catmaid/static/js/navigator.js
Merge branch 'master' of github.com:acardona/CATMAID
Merge branch 'master' of github.com:acardona/CATMAID
added RenderServTileSource (type 7) to fetch tiles from the Janelia tile
render web-service

https://github.com/saalfeldlab/render/tree/ws_phase_1

Documentation on

http://wiki/wiki/display/flyTEM/Render+Web+Service+APIs