Fixing
Merge branch 'master' of https://github.com/lufen/GeeksForSale

Conflicts:
	admin.php