upd on 19-8-13
Merge remote-tracking branch 'origin'

Conflicts:
	lib/megam/core/cloudtemplate.rb
cloud_template change
Merge remote-tracking branch 'origin'