Finish ButtonWithImage(Custom UI Component.)
Merge branch 'master' of github.com:visualcshape/Parallelformosa

Conflicts:
	Classes/CCPomeloWrapper.cpp