Commit
Merge branch 'master' of https://github.com/svceglug/focus

Conflicts:
	about.php