setup (Ware And Location Tag 100%)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ese/beans/SetupBean.java
edit