Merge origin/master

Conflicts:
	src/Database/DB_Manager.java
Merge origin/master