EDIT showdetail
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/showDetail2.css
	showDetail.php