Add common scripts
Add passport packages
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
Fix for crashing server
merge conflict