fixes on static pages
more fixes on static pages
Merge branch 'master' of github.com:unepwcmc/SAPI