changes in config
Merge branch 'api' of github.com:wysow/cobase into api

Conflicts:
	app/config/config.yml