added jx ws for api rest
Merge branch 'master' of github.com:LSIR/gsn
moved src to src/main/java
new data.html,added sum as aggregation and sampling in multidata request,added min_max_vals request in rest api
d3plots,other plugins
modified build include new src path
moved to src/main/java
Merge branch 'dataQueryAndPlots'

Conflicts:
	src/main/java/gsn/http/restapi/RequestHandler.java
application conf config
Merge branch 'master' into opensense

Conflicts:
	src/main/webapp/js/gsn.js