skill damage calculation
Merge remote-tracking branch 'origin/master'

Conflicts:
	template/js/json/translate.json