some change
Merge branch 'master' of https://github.com/combizs/simple

Conflicts:
	express_example/app.js
Merge branch 'master' of https://github.com/combizs/simple
database running with authentication

add passport google/fb
added google passport