according our style guide
Merge branch 'staging' into 229-rake-task-for-ontology-categories