Starting to integrate twitter bootstrap
Merge branch 'feature/shop_design' into develop