Update Colorado
Update glossary terms
Merge remote-tracking branch 'github/develop' into develop
Merge github develop into local repo