Merge origin/master

Conflicts:
	src/com/inversefunction/game/Pong.java