Merged LaanstraGJ additions back into de2 top level project