order history

'index view repair'
Merge branch 'master' of https://github.com/thuraucsy/onlineshop

Conflicts:
	fuel/app/classes/model/odr/product/table.php
	fuel/app/classes/model/odr/table.php
Merge branch 'master' of https://github.com/thuraucsy/onlineshop

Conflicts:
	fuel/app/views/user/orderhistory/index.php