aug17 from master with facebook
aug18 added readme info
jrt-aug18 added readme info
aug18 added readme info
jrt-aug18 added readme info
jrt-aug18 added readme info
jrt-aug18 added readme info
Merge branch 'development'

Conflicts:
	config/passport.js
	package.json
	tests/unit/models/user.unit.js