Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Add address fields to Location edit form
Remove erroneous rule from address2
Add location address values to controller save methods...
Merge pull request #72 from peelman/AddAddressToLocation

Add address to location form