Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
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