intermediate commit; prompt mode added
Merge branch 'gfate-intergration' of github.com:Chiel92/fate into gfate-intergration

Conflicts:
	todo
	userinterface.py