changed order of generating files
Merge branch 'hotfix-0.3.2' into develop
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop