negligible changes
Merge remote branch 'remote/master'

Conflicts:
	src/common/manager/Manager.java
Fixed some errors