merging model
Clean up server js
Fix broken branch
Merge branch 'master' of github.com:avillalain/ftd-web

Conflicts:
	server/models/schema.js
	server/server.js