skills, healing
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/entities/hero.js
	js/lib/graphic.js