Added generation of linux executable to Makefile.
Added JSON.org to dependencies and removed JSON.org source.
Merge branch 'master' of github.com:bemk/build

Conflicts:
	pom.xml