Merge branch 'release/2.0' into develop
Remove .classpath and include it in list of gitignore.
Remove commented code.
Merge branch 'develop'