Reworked annotation handling to allow annotations of different types as long as they are on different types
Merge branch 'master' of github.com:cwi-swat/rascal
Added missing case in annotation code, corrected handling of overload sets for annotations