Merge branch 'hotfix/2.0.2'
Serve assets dynamicaly
Merge branch 'hotfix/2.0.3' into develop