Included comment for master
Merge branch 'master' into pre-release

Conflicts:
	src/main/java/com/junittesting/example1/Calculator.java
Fixed comment in pre-release