Added functionality for collecting data from the Add New Location wizard.
Merge remote-tracking branch 'origin/master'