Merge branch 'hotfix/3.0.2'
fix for javascript error
paymentplan javascirpt fix
Merge branch 'hotfix/3.0.3' into develop