Merge origin/master

Conflicts:
	src/main/java/com/mycompany/rboss/controller/ProductController.java
	src/main/webapp/WEB-INF/rootconfig.xml
	src/main/webapp/WEB-INF/views/user/login.jsp
	src/main/webapp/WEB-INF/views/user/productList.jsp
Merge origin/master

Conflicts:
	src/main/java/com/mycompany/rboss/controller/ProductController.java
	src/main/webapp/WEB-INF/rootconfig.xml
	src/main/webapp/WEB-INF/views/user/login.jsp
	src/main/webapp/WEB-INF/views/user/productList.jsp
Merge origin/master

Conflicts:
	src/main/java/com/mycompany/rboss/controller/ProductController.java
	src/main/webapp/WEB-INF/rootconfig.xml
	src/main/webapp/WEB-INF/views/user/login.jsp
	src/main/webapp/WEB-INF/views/user/productList.jsp
Merge origin/master

Conflicts:
	src/main/java/com/mycompany/rboss/controller/ProductController.java
	src/main/webapp/WEB-INF/rootconfig.xml
	src/main/webapp/WEB-INF/views/user/login.jsp
	src/main/webapp/WEB-INF/views/user/productList.jsp
Merge origin/master

Conflicts:
	src/main/java/com/mycompany/rboss/controller/ProductController.java
	src/main/webapp/WEB-INF/rootconfig.xml
	src/main/webapp/WEB-INF/views/user/login.jsp
	src/main/webapp/WEB-INF/views/user/productList.jsp
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/rootconfig.xml