Merge pull request #893 from Wu-Hao/master

fixed #1934: fix bug in CCApplication, fix compatibility in EGLView
fix variable naming that causes advanced compiler to fail