Fix
Merge branch 'master' of https://github.com/northernbear/php

Conflicts:
	bluecross/presentation/detail.php