Datefunction
Merge remote-tracking branch 'origin/master'

Conflicts:
	lunchy/client/views/messages.js