Signed-off-by: montyqin <monty.qin@gmail.com>
Merge branch 'master' of https://github.com/montyqin/my_first_project.git

Conflicts:
	lancome/WebContent/catalog.jsp
	lancome/WebContent/nav4.jsp
	lancome/src/com/arvato/lancome2/web/servlet/CatalogServlet.java