updating editor
Merge branch 'master' of https://github.com/shashwatanand/openGLProjects

Conflicts:
	plugins/com.shashwat.opengl.firstdemo/src/com/shashwat/opengl/firstdemo/parts/editor/OpenGLEditor.java