24-aug-14 6.10PM
Merge branch 'master' of https://github.com/sorapan/smartshop

Conflicts:
	.idea/workspace.xml
	application/controllers/basket.php
	application/controllers/takeitem.php
	application/views/layout1/takeitem.php
	application/views/layout1/takeitem_takebasket.php
	asset/js/index_basket.js
	asset/js/index_publicMethod.js