Admin module restyled with bootstrap
Cash register module reskinned with bootstrap
full bootstrap reskin, but for stock module
payment screen ok, but could improve
payment page improved
cash register front end fixes
Merge branch 'master' into bootstrap

Conflicts:
	application/modules/admin/views/helpers/CategoryList.php
	application/views/scripts/index/main-menu.phtml
Merge branch 'master' into bootstrap