Merge branch 'develop'

Activates full testsuite run in Travis CI. Travis will complain as soon as at least one testcase does not pass successfully after a new commit.
Fixed compilation on Windows.
From the Vault: Twenty

// imported accidental commit from svn repo
removed Android gen dir
removed ads on Android version
removing commented lines I had intended to delete outright
Merge pull request #1 from WagicProject/android_cleanup

Android cleanup
Fixed PSP build and integrates it with Travis CI
Fixes stupid typo.
Introducing an error to check if Travis reports correctly a compile
error with the script.
Removes the error, it was perfectly detected by Travis CI.
Added Master of Waves
Added different names for attach and equip

+ moved implementation of AEquip to .cpp
Fixed issue with Cranial Plating.

Issue
	attach then equip: plating will give bonus to both creatures
Fix
	Changed "attach" to "retarget target(creature|mybattlefield)"
	as this doesnot admit this bug
	Attach should become deprecated in future
Merge pull request #555 from WagicProject/fix-cranial-plating

Fix cranial plating
Simplify Damage::resolve a bit
ActionElement.h: Replace defines, remove superfluous ";"

Defines do not follow scope rules, but enums do. Enum classes
even utilize strong type checking (but i am not sure about compiler
support for c++11 on all target platforms).
Replace defines in Damage.h with enums.
Fix some cppcheck warnings (mostly style and postfix vs prefix iteration)
Fix typo ActionLayer::receiveEventPlus(...)

This method is rarely used, however it returned 0 after adding stuff.
It now returns the sum.