Merge origin/master

Conflicts:
	web/Manager/createCustomer.jsp
Merge origin/master