Shop Framework finished
manually Merge branch 'master' of https://github.com/derfloh205/MOBAManager

Conflicts:
	hFiles/MManager.h