Merge remote-tracking branch 'origin/master' into origin_broker_193_carts_in_mongo

Conflicts:
	controller/app/controllers/cartridges_controller.rb
	controller/app/models/application.rb
	controller/test/cucumber/rest-applications.feature