Removed shell prompt for easier copy-pasting
Cleanup debug
Merge remote-tracking branch 'template/master' into install-all

Conflicts:
	README.md
Updated project-template