upgrade
Merge remote-tracking branch 'origin/secondBrand'

Conflicts:
	src/util/DatabaseUtil.java