fixed NPE on parsing + typo in trad
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop
removed error button when upload succeeds
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop