divers
Merge branch 'master' of https://github.com/xtazy/cdf
Merge branch 'master' of https://github.com/xtazy/cdf

Conflicts:
	app/config/config.yml
api