Conflicts:
	playbooks/roles/edxapp/tasks/deploy.yml
	playbooks/roles/edxapp/tasks/main.yml
	playbooks/roles/forum/tasks/deploy.yml
	playbooks/roles/forum/tasks/main.yml
	playbooks/roles/ora/tasks/deploy.yml
	playbooks/roles/xqueue/tasks/deploy.yml
	playbooks/roles/xqueue/tasks/main.yml