fkin idea files
console try
Merge branch 'master' of https://github.com/djavorszky/drunken-dangerzone

Conflicts:
	bin/com/shidan/asset/detector/Detector.class
	bin/com/shidan/asset/shader/ShaderLoader.class
talan