Buttons in shoppigview and skilldescriptions
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Model/Skills/Wizard/SkillAbsorb.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/View/ShoppingView.java