Merge origin/master

Conflicts:
	Images/aboutus-footer.gif
	Images/accreditations-small2.gif
	Images/managedservices-footer.gif
	Images/market-sectors-footer.gif
	Images/opservices-footer.gif
	Images/our-customers.gif
	Images/our-customers2.gif
	Images/our-customers3.gif
	Images/our-customers4.gif
	Images/products-footer.gif
	css/screen.css
	index.php
	style.css
Merge origin/master

Conflicts:
	Images/aboutus-footer.gif
	Images/accreditations-small2.gif
	Images/managedservices-footer.gif
	Images/market-sectors-footer.gif
	Images/opservices-footer.gif
	Images/our-customers.gif
	Images/our-customers2.gif
	Images/our-customers3.gif
	Images/our-customers4.gif
	Images/products-footer.gif
	css/screen.css
	index.php
	style.css
Merge origin/master

Conflicts:
	Images/aboutus-footer.gif
	Images/accreditations-small2.gif
	Images/managedservices-footer.gif
	Images/market-sectors-footer.gif
	Images/opservices-footer.gif
	Images/our-customers.gif
	Images/our-customers2.gif
	Images/our-customers3.gif
	Images/our-customers4.gif
	Images/products-footer.gif
	css/screen.css
	index.php
	style.css