JSONParser bug fix, btw it needs additional tests
JSONParser now use FileStream, fixed
luajit integrated, JSONParser fixed
Merge branch 'master' into resource-manager

Conflicts:
	tools/CMakeLists.txt