bob added file and removed 1 file + ingos file
Merge branch 'developers/bob'
Merge branch 'ingo'