Merge origin/master

Conflicts:
	MonitoraNuvem/src/main/java/br/com/monitoranuvem/properties/user.properties
Merge origin/master

Conflicts:
	MonitoraNuvem/src/main/java/br/com/monitoranuvem/properties/user.properties