Merge pull request #25 from code-disaster/master

More error handling, /LARGEADDRESSAWARE support
Copying VM argument strings to JavaVMOption struct, instead of referencing picojson return values. Fixes #28.
Updated prebuilt libraries.
Merge pull request #30 from code-disaster/master

Copy VM argument strings to JavaVMOptions
Merge branch 'master' into osx-10.6-support
OS X: check /usr/libexec/java_home if no JAVA_HOME set. Fall-back to bundled JRE if no system JRE found on OS X 10.6.
Merge branch 'osx-10.6-support' into icons

Conflicts:
	src/main/resources/packr-linux
	src/main/resources/packr-linux-x64
	src/main/resources/packr-mac
	src/main/resources/packr-windows.exe