add gulp development tasks
add jitter callback function
Merge remote-tracking branch 'origin/master' into philipp

Conflicts:
	server/package.json
working on REST tests