Merge branch 'master' of https://github.com/mbuchwald/HexactaLabs-Java
5/9
Merge branch 'fdoll-master'