add Android

add andriod project
continue
Merge remote-tracking branch 'origin/master'

Conflicts:
	cocos2d/cocos/audio/proj.win32/Debug.win32/CocosDenshion.log
	cocos2d/extensions/proj.win32/Debug.win32/libExtensions.log
	cocos2d/external/chipmunk/proj.win32/Debug.win32/chipmunk.log
	proj.win32/FishLight.vcxproj.filters