removed old junk folder
Merge branch 'dev'