fix image url on none unix machines
Merge branch 'develop' into feature/tv

Conflicts:
	xdm/classes.py
new logic for comparing old an new element