Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Added progress monitor and made percentages work
Merge remote-tracking branch 'origin/master'
Added stylings
Changed a couple of OrderManagerTest things.
Merge remote-tracking branch 'origin/master'
Refactored update status method to belong to the order class.
Added product statistics to Product.java and OrderManager.java
Updated order status percentages to ignore delivered orders (as these are complete so no need to monitor).
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/sqldialects.xml
	src/com/sky/bootcamp/accessoriesstore/Catalog.java
	src/com/sky/bootcamp/accessoriesstore/Product.java
	web/internal_site/util/validateUser.jsp
Merged Consumer and BusinessCustomer class. FROM NOW ON PLEASE JUST USE CUSTOMER
Merge remote-tracking branch 'origin/master'
updated homepage
Merge branch 'master' into moins
working login page along with redirect