All Customer and Order Admin Completed
Merge branch 'developer' of https://github.com/anhdv282/AssignmentWPSJ into developer

Conflicts:
	Assignment/web/WEB-INF/web.xml