Remove ignored parameter.
Fix wrong index in error message.
Merge branch 'master' into cpp11

Conflicts:
	src/entities/Hero.cpp