Initial server implementation
Merge branch 'master' of github.com:avillalain/ftd-web

Conflicts:
	server/server.js
merging
Merge branch 'master' of github.com:avillalain/ftd-web

Conflicts:
	server/server.js