Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'master' of https://github.com/robccarey/SkyAccessoriesWebsites
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 branch 'bootstrap'

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

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

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

Conflicts:
	web/bootstrap/index.jsp
User login and home page personalisation
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/internal_site/util/validateUser.jsp
Merging.
Merge branch 'RobAndBen'