Merge branch 'master' of https://github.com/aveyD/Diablo3Armory

Conflicts:
	Diablo3Armory.iml