shopping_cart stripped
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
shopping_cart modified and sell partly added
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
hehe
fuck prefix
chong gou shoppingcart
hehe
delete config.php
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3

Conflicts:
	Conf/config.php
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
Show commodity list and shipping address in order generation page. (red3)
add icon for purchase and shopping cart
sell almost done
sell almost done
upload image done
upload bug fix
Ordergen Finished! Next step is order process (generate/cancel), which
cooperate with group 2.
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
only small changes