Now generating JSONP
Merge branch 'master' of github.com:g4dpz/fcdw_data

Conflicts:
	WebContent/WEB-INF/views/home.jsp