add fields controller
Merge branch 'dev' of github.com:lintubongarit/sulka into field_json

Conflicts:
	src/main/java/edu/helsinki/sulka/controllers/HomeController.java
	src/main/webapp/WEB-INF/views/slick.jsp
	src/test/java/edu/helsinki/sulka/controllers/HomeControllerTest.java
Merge branch 'field_json' into dev
Merge branch 'dev' of github.com:lintubongarit/sulka into dev