update location list to use comb_code
Merge branch 'master' of github.com:maxcobmara/catechumen

Pull Merge