none
Merge branch 'master' of https://github.com/andreabar/SDElaborato

Conflicts:
	src/view/controllers/LoginController.java
	src/view/views/SearchTab.java