update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ese/model/dao/LocationDAO.java
	src/main/java/com/ese/model/dao/LocationItemsDAO.java
	src/main/java/com/ese/service/LocationItemService.java
	web/login.xhtml
update
Merge remote-tracking branch 'origin/master'