all
Merge branch 'master' of https://github.com/shah-hardik/internet_isp

Conflicts:
	instance/front/controller/towers.inc.php
	instance/front/tpl/tower.js.php
all