Cloud feature personnalize
Merge branch 'master' of github.com:superguigui/crma15-workshop-showcase

Conflicts:
	build/build.js