0.9
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projeto Cloud/src/control/Controller.java