Removed duplicate file
Merge branch 'development' into fallingblocks