Merge branch 'master' of https://github.com/Arctium/Arctium-WoW into Arctium-master

Conflicts:
	Arctium.sln