search skeleton
3 types of goods in search
test commit
modify payment.sql: add orders table(Group 3)
test commit.
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
chonggou..
Merge branch 'master' of https://github.com/justinwm/SE-Payment into group3
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
general goods search constraints added.
shopping_cart basics
shopping_cart basic
Update config.php
settlement
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
settlement
place fields and special fields
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3

Conflicts:
	Tpl/Purchase/search.html
Merge branch 'master' into group3
merge payment db;use payment to update