Reader path selection
Merge branch 'dev' of https://github.com/fhacktory/PictIF into dev

Conflicts:
	mainserver/server.py
	mainserver/static/js/draggable.js