Added Env.callAsyncInParallel
used Env.callAsyncInParallel in several places
Merging and resolving conflicts
Restored logic swallowed by merge
Apparently, parallel calls didn't make them go away

On top of that, jenkins seems to be even more sensitive than usual to
these errors -- a time of day thing? Server load?
Why is it only suddenly failing on these *now*?

And why is jenkins only failing one of them at a time? And a different
one each time?
Added BMInterface->resolve_random_button_selection()
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
Added logic for the Maximum skill
Reverting extra qunit changes added for jenkins

Because the jenkins test failures that these were added to deal with may
have been flukes.
Merging and resolving conflicts
Revert "Reverting extra qunit changes added for jenkins"

This reverts commit ef7078cd24a43966123bed9077009f5ca8dafbab.
Removed wildcards from views
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
- Made many BMInterface public methods into protected methods
- Added reflection versions of load_game() and save_game() to BMInterfaceTest