Temporarily changed reference

This should be removed later
Merge branch 'master' into BoardEditor