fix bugs in CCDictionary & platform/win32/CCImage.cpp::setFont, according to BitWave's codereview.
fix bugs in CCDictionary::objectForKey(int/string)
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20

Conflicts:
	cocos2dx/cocoa/CCDictionary.cpp
	cocos2dx/platform/win32/CCImage.cpp
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Fix crash for call runAnimation() in CCBAnimationManagerDelegate::completedAnimationSequenceNamed; Set mRunningSequence to NULL before any runAnimation() call;
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Consistent use of CCAssert

 * Remove @
 * Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Assert implementation for Android

    * __android_log_assert is not stable
    * Uses __android_log_print instead
CCAssert uses CC_ASSERT directly

 * ... after call to cc_assert_script_compatible()
 * CCAssert will now report the correct line number