Merge release/cheetah into develop

Nitpicking, but you could also use an Ember "link-to". Something like: {{#link-to 'page' page_id}}. (The Django id is 19 in the admin I believe)