Added Buttons and edit box
Have not done much, moar like a backup commit :D
Cart done
Merge remote-tracking branch 'origin/padula'

Conflicts:
	candystore/application/config/autoload.php
	candystore/application/models/order.php
	candystore/application/models/order_item.php
	candystore/application/models/order_item_model.php
	candystore/application/models/order_model.php