merge
merge Merge branch 'master' of https://github.com/rogerseyebyte/NSLAmap

Conflicts:
	index.php
form tweaks rd 1