Merge branch 'master' into sandbox

Conflicts:
.classpath
src/data/Data.java