Modified some bugs
Merge branch 'master' of https://github.com/topcoder1105/gles_Project3
Merge