Merge branch 'develop'
corrected extension
deleted file ref
Merge branch 'master' into develop