Merge branch 'master' into develop
Merge pull request #596 from bjornsnoen/master

Fix a rarity mistake and a grammatical error
Fixed issues found by XCode.
Merge branch 'master' into Qt5.2_macx
Removed file wrongly added.
Tries to fix android sdk installation in Travis
Include c++11 threading
Removed c++11 warning.
Merge pull request #598 from bjornsnoen/master

Damager keyword
Adds executioners_swing tests in _tests.txt
Fixed formatting
Fixed issue with multiple basic abilities in TargetChooser

E.g. card create[trample;haste] wasn't handled properly
Fixed grave pact
Revert "Fixed issue with multiple basic abilities in TargetChooser"

This reverts commit d9816c7ad0ae3d5629fa0d0be489be2fe3f8e3af.
attempt to make android tools fetching for TravisCI explicit and futureproof
Merge pull request #599 from WagicProject/android_travis_explicit

Attempt to make android tools fetching for TravisCI explicit and futureproof
updated credits text
update android build tools version
Merge pull request #600 from WagicProject/android_build_update

update android build tools version
Adds a Downloader component to JGE able to download and cache files.