Merge origin/master

Conflicts:
	src/database/models/Antitypo.java
	src/database/models/Melos.java
	src/database/models/Vivlio.java