Merge branch 'neykho-Diablo3Armory' of https://github.com/aveyD/Diablo3Armory into david-Diablo3Armory
Merge branch 'neykho-Diablo3Armory' of https://github.com/aveyD/Diablo3Armory into david-Diablo3Armory
Merge branch 'david-Diablo3Armory' of https://github.com/aveyD/Diablo3Armory into david-Diablo3Armory