Merge branch 'personal/kob' into personal/ice
test model
clean test
view bottom
view bottom
view
clean
re write pic
product list
full design
full design
Merge branch 'personal/kob' into personal/ice_mac

Conflicts:
	app/controllers/testController.php
	app/routes.php