item-wishlist
Merge branch 'master' of https://github.com/yunajing/asyouwish

Conflicts:
	war/WEB-INF/web.xml
database version1