Added basic logic for validating a Default attack
Added logic to cache the actual attack type for a Default attack
Added logic to commit the resolved attack when attempting to commit a Default attack
Dealt with PMD warning
Added explicit ordering of attack types, with Power and Skill first, then in alphabetical order
Merge remote-tracking branch 'upstream/master' into 158_attack_type_order

Manually resolved conflicts in:
	src/engine/BMAttack.php
	test/src/engine/BMGameTest.php
Fixed line endings
Ensure that default attacks log the resolved type
Merge pull request #1120 from blackshadowshade/158_attack_type_order

Default attack, and attack type order
Merge remote-tracking branch 'upstream/master' into 1130_phpdoc