Fixing conversion page
Fixing js sintaxe
Merge branch 'master' into develop