Add andy-edmonds and ZHAW.ch into default data

Change-Id: I3a076a6ae32974671c8661fe671d716dba381400