removed duplicate named file
Replaced incorrectly named file
Merge branch 'master' into dev