Release x changes
Merge branch 'master' into Release-x

Conflicts:
	src/com/calc/CalculatorDemo.java