Merge branch 'master' of 13.56.215.252:/web/rpo/AnsjerFormal into master_devma

 Conflicts:

	Ansjer/formal_settings.py

	Controller/CloudStorage.py