Just a refresh
Merge branch 'master' of github.com:drusmanbashir/deejay
Merge branch 'master' of github.com:drusmanbashir/deejay
well

Conflicts:
	static/editor/js/canvas.js
THINGS TO DO IN EDITOR MODELS.PY
add folder relational field the number of which depends on number of
folders in the dicom repo
under each folder there will be a relationship of files(numpy)

Admin will load folders as array[folder][npfile]
and then send that to template which will decide number of canvas
elements on numbewr of folders