Removed unfinished samples from master branch
Merged from dev
Fixed conflicts
Merged from dev
Merge branch 'dev'
Merge branch 'dev'