Merge branch 'master' into inhouse
added passport.js
Merge branch 'inhouse' of W:\bkp\repos\myapp_bare into inhouse