price range
Merge branch 'master' of https://github.com/justinwm/SE-Payment
commit before pull
version 2
Merge branch 'master' of https://github.com/justinwm/SE-Payment

Conflicts:
	Conf/config.php
	Lib/Model/ShoppingCartModel.class.php
Merge branch 'master' of https://github.com/justinwm/SE-Payment

Conflicts:
	Conf/config.php
	Tpl/Public/js/.DS_Store
	payment.sql