removed prompt
Merge conflicts gone
Merge branch 'master' into development

Conflicts:
	tests/timetrial.py