Fixed adhoc_setup for jeroen
Merge conflicts
Fixed brackets
Changed IPS
Merge branch 'master' into jeroen
Added first Gui and refactored packages
Correct commit with refactoring
Fixed color reset in adhoc_(de)setup and merge conflicts.