Fixed security issue with dynamic generated links
Fixed impor files for references
Merge branch 'master' of github.com:unepwcmc/SAPI