WS Return bug fix
Merge branch 'master' of github.com:kickyourapp/KYA-Guice-MVC

Conflicts:
	src/JsonWS/com/kya/guice/mvc/jsonws/JsonWSController.java