removed dev file
Merge branch 'develop'