Merge origin/master

Conflicts:
	src/amazon/FinestraLibro.java
Merge origin/master