express js
Merge branch 'master' of github.com:hemstreet/Titan-Alfred

Conflicts:
	adapters/Express3.js