Merge branch 'master' of https://github.com/makilian/Mist

Conflicts:
	img_proc/project.py