update location form fields
Merge branch 'master' of https://github.com/USM-RCG/mirth-channels
typo in location SQL
Merge branch 'master' of https://github.com/USM-RCG/mirth-channels

Conflicts:
	src/main/resources/global-scripts.xml