Fix dateFormat module in server
Merge branch 'master' of https://github.com/justplay1/hackathon

Conflicts:
	Server/routes/core_server_routes.js