Merging changes to CivicNinjas:master