Added new files with changes from COP 16
Merge branch 'master' of github.com:unepwcmc/SAPI