commit master branch advance (gregor demo=)
Merge branch 'master' into Featurebla(gregordemo)

Conflicts:
	src/main.c