Merge branch 'master' into develop
More debug
OMG I so hate shells
Should fix issue #497 with the broken freezing the game.
Remove unused Effects.h/.cpp and class Effect

There was an empty vector of effect* in PlayGuiObject.
Avoid circular initialization
Update README.md

Added sample play-through video link
Fix makefile
Fix android makefile
Merge pull request #601 from ZobyTwo/cleanup_3

Remove dead code and fix circular initialization
updating to latest code from master

Merge branch 'master' into develop
updated project file for iOS to work with current codebase
- added missing source/headers (GameView.h, CarouselView.h, etc )
- removed dependency on admob static library
- removed CardEffect.h and CardEffect.cpp from project reference
- removed -no_implicit_dylibs flag (apparently no longer supported)
- added -fno-objc-arc (turns off ARC compilation for entire project)
- added -DTIXML_USE_STL
update Xcode build preferences as recommended by XCode.
Merge branch 'develop' into feature/ios-update-xcode5.1
Update README.md

Added build status on AppVeyor
Trying to fix android build
Upgrade Android SDK to r23.0.2
Activating logs on android issue
Deactivate window cross-compiling build
Merge pull request #602 from WagicProject/feature/ios-update-xcode5.1

Feature/ios update xcode5.1