Issue #2 WIP
Merge remote-tracking branch 'remotes/origin/master' into master_java8

Conflicts: (resolved)
	Applications/Sandbox/.classpath