test
Merge branch 'master' of https://github.com/Gbros-code/grock

Conflicts:
	src/org/grock/view/JsonView.java
	src/org/grock/view/template/FreeMarkerView.java