PageForward update
Merge remote-tracking branch 'choose_remote_name/master'
Merge remote-tracking branch 'choose_remote_name/master'
Merge remote-tracking branch 'choose_remote_name/master'
modify bug
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/main/webapp/shop/shop.html