Log4j fixed
JSON REST - GET, POST
Merge branch 'master' into tomasj3

Conflicts:
	src/main/resources/log4j.xml