removed irrelevant copyrights
using ARC in FromSources project
fixing edge case scenario
Update README.md
Update README.md
Fix android compilation issue
See discussion: http://answers.soom.la/t/closed-soomla-store-cocos2d-x-android-error/360/19
Adding support for no-native run + updating submodules
Merge branch 'konopka-master'

* konopka-master:
  Fix android compilation issue See discussion: http://answers.soom.la/t/closed-soomla-store-cocos2d-x-android-error/360/19
Merge branch 'master' into inEditor

* master:
  Fix android compilation issue See discussion: http://answers.soom.la/t/closed-soomla-store-cocos2d-x-android-error/360/19
align Android
adding more error handling methods
rebuilt libs
adjusting event dispatcher
fixing up projects
updating submodules
Merge branch 'inEditor'

* inEditor:
  updating submodules
  fixing up projects
  adjusting event dispatcher
  rebuilt libs
  adding more error handling methods
  align Android
  Adding support for no-native run + updating submodules
adding changelog
Merge branch 'master' into cocos2dx-v2

* master:
  adding changelog
  updating submodules
  fixing up projects
  adjusting event dispatcher
  rebuilt libs
  adding more error handling methods
  align Android
  Adding support for no-native run + updating submodules
  Fix android compilation issue See discussion: http://answers.soom.la/t/closed-soomla-store-cocos2d-x-android-error/360/19
  Update README.md
  Update README.md
  fixing edge case scenario
  using ARC in FromSources project
  removed irrelevant copyrights

Conflicts:
	Cocos2dXCore.xcodeproj/project.pbxproj
	Soomla/CCAbstractAggregatedEventHandler.h
	Soomla/CCCoreEventDispatcher.cpp
	Soomla/CCCoreEventDispatcher.h
	Soomla/CCCoreService.cpp
	Soomla/CCError.cpp
	Soomla/CCError.h
	Soomla/CCNdkBridge.cpp
	Soomla/CCSoomlaEventDispatcher.cpp
	Soomla/rewards/CCRandomReward.cpp
	build/android/Cocos2dxAndroidCore.jar
	build/android/SoomlaAndroidCore.jar
	build/ios/libCocos2dXiOSCore.a
	build/ios/libSoomlaiOSCore.a
	development/Cocos2dxCoreFromSources.xcodeproj/project.pbxproj
	development/soomla-native/projects/cocos2dx-ios-core/CoreCocos2dx/CoreService.mm
	development/soomla-native/projects/cocos2dx-ios-core/CoreCocos2dx/ParamsProvider.mm
	development/soomla-native/projects/cocos2dx-ios-core/CoreCocos2dx/ServiceManager.mm
fixing project to fit v2 mac
updating android.mk for jsb