pages...
Merge branch 'master' of github.com:Evil-Bunny/ECOM_war

Conflicts:
	web/WEB-INF/web.xml