modified mk files
updated template
Merge branch 'v3quick' of github.com:dualface/cocos2d-x into v3quick

Conflicts:
	quick/lib/extra/Android.mk
	quick/templates/PROJECT_TEMPLATE_01/proj.android/jni/Android.mk