Before merge
Merge branch 'master' of https://github.com/bcronertrevenge/TetraWord + Javadoc

Conflicts:
	nbproject/private/private.xml