Will this work?
More updates?
Merge branch 'master' of https://github.com/MatudaGames/DwarfForest

Conflicts:
	Classes/Dwarf.cpp
	Classes/Web.cpp
	proj.android/.project
	proj.android/bin/DwarfForest.apk
	proj.android/bin/classes.dex
	proj.android/bin/dexedLibs/android-support-v4-79a5d8644a7da21be0d7ffdad39cd6ed.jar
	proj.android/bin/dexedLibs/annotations-9510218fdd037f55f12e12c3d61a56f2.jar
	proj.android/bin/dexedLibs/facebooksdk-ddebe003b9a5fe51eb82a935b32a37eb.jar
	proj.android/bin/dexedLibs/flurryAnalytics_3.4.0-aa9c5d283946223c71cb40bd8769c603.jar
	proj.android/bin/dexedLibs/google-play-services-a1a11574b72bd77ea5f219947a875916.jar
	proj.android/bin/dexedLibs/libcocos2dx-f498f1aa9d4d91c6b35c74db324cd2b7.jar
	proj.android/bin/dexedLibs/simple facebook-0d33a48356fff5d364e05cb6f2a9f1da.jar
	proj.android/bin/resources.ap_
	proj.android/libs/armeabi/libcocos2dcpp.so
	proj.android/obj/local/armeabi/libbox2d.a
	proj.android/obj/local/armeabi/libchipmunk.a
	proj.android/obj/local/armeabi/libcocos2d.a
	proj.android/obj/local/armeabi/libcocos2dcpp.so
	proj.android/obj/local/armeabi/libcocosdenshion.a
	proj.android/obj/local/armeabi/libcpufeatures.a
	proj.android/obj/local/armeabi/libextension.a
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/AdvancedAnimation.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/AdvancedAnimation.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/AppDelegate.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/BeforeQuitScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/ChallengesScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Crystal.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Crystal.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/CrystalIntro.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/CrystalIntro.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DailyChallenges.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DailyChallengesPopUp.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DailyChallengesPopUp.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DailyChallengesScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DebugScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Diamond.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DiamondIntro.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DiamondIntro.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Dwarf.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Dwarf.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DwarfIntro.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/DwarfIntro.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Effect.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Effect.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/EffectIntro.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/EffectIntro.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Enemy_Bee.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Enemy_Bee.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/ExperienceBar.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/FreeStuffPopup.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/FreeStuffPopup.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/GameScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/GameScene.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/GameStats.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Goblin.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Goblin.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Hidra.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Hidra.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/HidraIntro.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/HidraIntro.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/IceBarrage.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/IceBarrage.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/InGamePowers.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/InGamePowers.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/IntroAnimation.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/IntroAnimation.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/LevelEndMenu.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/LevelEndMenu.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/LevelEndMissions.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/LevelEndScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Levels.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/LoadingScreen.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/LoseScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Machine_Enemies.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Machine_Enemies.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Machine_Ghost.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Machine_Ghost.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Machine_Stamp.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Machine_Stamp.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/MainMenuScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/MainMenuScene.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/MissionManager.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/MissionManager.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/MissionScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Mushroom.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Mushroom.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PauseScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PauseScene.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantCrystal.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantCrystal.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantFuzzBall.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantFuzzBall.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantIceFlower.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantIceFlower.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantSunFlower.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PlantSunFlower.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Plant_Crystal_Weed.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Plant_Crystal_Weed.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PopUp.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PopUp.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Rain.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Rain.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/SaveMeScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/SaveMeScene.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Spider.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Spider.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/SpriteAnimation.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/StaticSceneManager.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/StaticSceneManager.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/StatsBox.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/StatsScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/StoreBox.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/StoreOfferPopup.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/StoreScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/SupportPopup.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/SupportPopup.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/TimedSpriteAnimation.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Troll.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Troll.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/TrollBullet.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/TrollBullet.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/TrollIntro.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/TrollIntro.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/TutorialScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/TutorialScene.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/UpgradeScene.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/User.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/UserStats.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Web.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Web.o.d
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/WeeklyChallenges.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Wind.o
	proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Wind.o.d
	proj.android/obj/local/armeabi/objs/cocos2dx_static/CCConfiguration.o
	proj.android/obj/local/armeabi/objs/cocos2dx_static/draw_nodes/CCDrawNode.o
	proj.android/obj/local/armeabi/objs/cocos2dx_static/draw_nodes/CCDrawNode.o.d
	proj.android/obj/local/armeabi/objs/cocos_extension_static/AssetsManager/AssetsManager.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCBAnimationManager.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCBReader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCBSequenceProperty.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCControlButtonLoader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCLayerGradientLoader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCMenuItemImageLoader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCNodeLoader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CCBReader/CCNodeLoaderLibrary.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Action/CCActionEaseEx.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Action/CCActionFrame.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Action/CCActionNode.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/ActionTimeline/CCActionTimeline.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/ActionTimeline/CCActionTimelineCache.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/ActionTimeline/CCFrame.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/ActionTimeline/CCNodeReader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Armature/CCArmature.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Armature/CCBone.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Armature/animation/CCArmatureAnimation.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Armature/datas/CCDatas.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Armature/display/CCBatchNode.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Armature/utils/CCArmatureDataManager.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Armature/utils/CCDataReaderHelper.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Components/CCComAttribute.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Components/CCComAudio.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Components/CCComRender.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/BaseClasses/UIWidget.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/Layouts/UILayoutParameter.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/UICheckBox.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/UILabel.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/UILabelAtlas.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/UILoadingBar.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/UIRichText.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/UISlider.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/GUI/UIWidgets/UITextField.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Json/DictionaryHelper.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Reader/GUIReader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Reader/SceneReader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Trigger/ObjectFactory.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Trigger/TriggerMng.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/CocoStudio/Trigger/TriggerObj.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCControlExtension/CCControl.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCControlExtension/CCControlHuePicker.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCControlExtension/CCControlSwitch.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCControlExtension/CCScale9Sprite.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCEditBox/CCEditBox.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCEditBox/CCEditBoxImplAndroid.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCScrollView/CCScrollView.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/GUI/CCScrollView/CCTableView.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/network/HttpClient.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/network/WebSocket.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/physics_nodes/CCPhysicsDebugNode.o
	proj.android/obj/local/armeabi/objs/cocos_extension_static/spine/CCSkeletonAnimation.o