j
Merge https://github.com/hlavko/hexx

Conflicts:
	setup/levels/tutorial_level01.xml
	setup/levels/tutorial_level02.xml
	setup/levels/tutorial_level03.xml
	setup/levels/tutorial_level04.xml
	setup/locale.us.xml
	setup/setup.xml
list of assets