update config
Merge branch 'master' of https://github.com/Jeremial/akoa

Conflicts:
	config.js