Resolve merge conflicts in features.ccs.
Merge branch 'master' of github.com:driesdeclercq/spoor8
Homepage session on mobile theming.