iml commit
Merge branch 'master' of https://github.com/aveyD/Diablo3Armory into david-Diablo3Armory

Conflicts:
	.idea/modules.xml
	Diablo 3 Armory/src/main/java/com/somethingnifty/diablo3armory/activity/HeroDetailsActivity.java