Update
Merge branch 'step6'

Conflicts:
	app/config/azure_build_number.yml
	app/config/config_azure.yml
	app/config/config_azure_dev.yml