Changes from AST merged
Merge branch 'master' of github.com:swp-uebersetzerbau-ss13/fuc