simular
Merge origin/master

Conflicts:
	Demotica/src/Swing/DashBoardExe.form
	Demotica/src/Swing/DashBoardExe.java