like button
Merge branch 'master' of https://github.com/Lingcod/dbproject

Conflicts:
	activity.php
	location.php