Merge origin/master

Conflicts:
	sources/Manager/Main.java