DIVISION BY 2
Merge remote-tracking branch 'origin/master' into DivideBy2

Conflicts:
	org.eclipse.example.calc/src/org/eclipse/example/calc/internal/Calculator.java