Merge branch 'master' of https://github.com/marcelop/whackem.git

Conflicts:
	src/com/mobwin/whackem/MenuBuilder.java
Merge branch 'master' of https://github.com/marcelop/whackem.git