commit on dev and adding dir
Merge branch 'master' into dev