fix to activate location if inactive
Merge branch 'ghana-dev' into ghana-master