Fixed type instantiation code to ensure overloaded function types are properly instantiated when give as function parameters
Merge branch 'master' of github.com:cwi-swat/rascal