bug fix release
Merge branch 'master' into dev

Conflicts:
	src/com/sam/hex/view/BoardView.java