Change to tag 1.2.5
Merge branch 'master' of https://github.com/rightshift/cocos2d-x

Conflicts:
	plugin