Fix bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	flyway/flow/update_project_user_role_task.py
Merge branch 'master' of https://github.com/Phoenix1708/OpenAcademy_OpenStack_Flyway
Fix bugs + update web (output VMs)
Merge remote-tracking branch 'origin/master'