Delete .classpath
Merge branch 'develop'