merge com origin
Merge branch 'master' of
https://github.com/felipecomp19/StoreManagement.git

Conflicts:
	StoreManagement/src/main/webapp/WEB-INF/views/client/clientForm.jsp