added gsn services in play
conf params defaults
modified default db name
changes in gsntools for provisional service rest
Merge branch 'master' of github.com:LSIR/gsn

Conflicts:
	src/main/java/gsn/http/restapi/RequestHandler.java
remove duplicate variable names
fixes the merge conflict in src/main/java/gsn/http/restapi/RequestHandler.java
Merge pull request #33 from kjorg50/merge-fix

Fixes merge conflict in RequestHandler.java
Adding possibility for Chart virtual sensor to specify windows length by time
Merge branch 'master' of https://github.com/LSIR/gsn
adding type bigint, mapping to long, to CSV parser in the Wrapper (as currently numeric maps to double). This can be used to directly input timestamps (in milliseconds).
fix for zeromq field values
Merge pull request #40 from nevenag/master

fix for zeromq field values
Update StreamElement.java

timestamp provided, they can be set before 1970, e.g. negative timestamps.
updating jetty to support disabling of SSLv3 (not supported anymore by firefox 34)
updating requirement for jetty in sbt
Merge branch 'master' into opensense

Conflicts:
	conf/gsn.xml
	src/main/java/gsn/Main.java