finishing changes
Merge branch 'add-fancybox' of https://github.com/SavorWeb/ServiceMaster into add-fancybox

Conflicts:
	about.php