Merging
Merge branch 'master' of https://github.com/cwi-swat/rascal.git
Fixed number of parameters for module_init_fun and module_init_testsuite