env fixes
Merge branch 'master' of https://github.com/Asich/LwjglGetStarted

Conflicts:
	LwjglGetStarted.iml
	core/core.iml
	desktop/desktop.iml
	html/html.iml