Gdrooid-master branch merged
New class plus updates
New class plus updates
Merge branch 'fasaas-master' into gdrooid-master

Conflicts:
	Boiler.java
	Termonator.ice
Added getTemperature
Merge branch 'fasaas-master' into gdrooid-master

Conflicts:
	Termonator.ice
Arregladas funciones addController y findProxy