Merge branch 'kma2'

Conflicts:
AccessURLs.py
Resolved