Commit to merge
Merge branch 'master' of https://github.com/andreabar/SDElaborato

Conflicts:
	src/views/LoginPage.java