DAR Sprint 7

This request is to merge our sprint branch into dev.

This includes the following changes that have already been code reviewed and QA'd:

- https://github.com/Wikia/app/pull/864
- https://github.com/Wikia/app/commit/0fd22fe56b742be86a260317340db0907c502a1c (There was no pull request for this :frowning:, but it was code reviewed and QA'd. See DAR-201 in Jira for details.)