Merge origin/master

Conflicts:
	src/additionapplet/AdditionApplet.java