Added JSON tests
Added a resource test class
Merge branch 'master' of https://github.com/goranstack/learn-js.git

Conflicts:
	catchcrud/pom.xml
	catchcrud/src/main/java/se/atg/catchcrud/FishCatchService.java
	catchcrud/src/main/java/se/atg/catchcrud/core/FishCatchesDAO.java
	catchcrud/src/main/java/se/atg/catchcrud/resources/FishCatchResource.java