minor config changes
Merge branch 'master' of https://github.com/guillaume-gouchon/angelpal

Conflicts:
	server/lib/db-mysql.js