merged While implementation and other changes from my hidden branch :)
added TODOs
added TODO
removed useless files in bundle
fixed "view" action when using in notepad++ (via NppExec) on some computers
Merge remote-tracking branch 'origin/master'

Conflicts:
	tests/functional/simulation.yml