bug fix sparql generation
Merge remote-tracking branch 'origin/master'
wip
Merge remote-tracking branch 'origin/master'

Conflicts:
	sandbox.coffee
	server/lib/abstracter.coffee