Updated Config
Merge branch 'master' of https://github.com/StarterLog/starterlog

Conflicts:
	server/config/auth.js
	server/config/database.js