core fix2
Merge branch 'master' of https://github.com/Asich/LwjglGetStarted

Conflicts:
	core/core.iml