bug fix - POST with JSON object now works
Merge branch 'master' of https://github.com/koushiksinha/AIDR-GF4

Conflicts:
	aidr-output/src/main/webapp/WEB-INF/web.xml