error fixing when testing sync first
Merge branch 'master' of https://github.com/CiviCooP/dgwcivi43eh

Need to push error fixes in sync, Jaap has been working on templates