updated to version 1.0.5
added config options for the Fire skill
Merge branch 'master' into 1.4.6

Conflicts:
	build.xml