Mergin
Merge branch 'master' of github.com:avillalain/ftd-web

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

Conflicts:
	lib/findthedude.js
	public/scripts/security/services/dudes.js
	server/lib/controllers/dudes.js
	server/routes.js
web fixes