test
Merge branch 'dev' of https://github.com/Xlythe/HexGame_Android into dev

Conflicts:
	src/com/sam/hex/MainActivity.java