Fix problem with deployment
fixed duplicated folders problem
Merge branch 'dev' into release/0.2