Added escher to requirements.txt
Merge branch 'devel' into vagrant

Conflicts:
	requirements.txt