removed "kontakt", debugging output and some unnecessary controllers
Merge remote-tracking branch 'origin/master'