Check
Merge branch 'master' of github.com:soulnai/map

Conflicts:
	info.php