Merge branch 'master' of C:\Users\Mza\Documents\GitHub\galaxy with conflicts.
Moved superclass initialisation to classreference class
moved junit-4.7.jar to galaxy/libraries