added e-mail and date to data api
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/routes/api.js