merge pull reqeust fixing for iOS7 and Xcode5 into master
LabelTTF vertical alignment fixed on OS X

vertical alignment was broken on OS X.
top and bottom were switched.
Template fix for iOS Template.
Fix a bug (https://github.com/cocos2d/cocos2d-x/pull/2902)
android target 17 --> 8.
[Windows] multi-platform-lua fix.
Merge pull request #2903 from dumganhar/master

Template fixes for iOS and Windows
make convertToWindowSpace public;
Remove unused spriteFrame when purgeCachedData; Make edit box padding a little bit larger; clean logs;
Merge remote-tracking branch 'upstream/master' into master_base_2.1.4
always notify the js side;
Merge branch 'stuff' into master_base_2.1.4

Conflicts:
	cocos2dx/base_nodes/CCNode.h
make AssetsManager::createDirectory static and public;
clean chipmunk and webp stuff in Android mk file;