5july
Merge branch 'master' of github.com:amolc/zestour

Conflicts:
	footprint.php