Merge origin/master

Conflicts:
	src/java/commands/SaveCustomerCommand.java