am 60582519: Merge "More colors, now with material colors" into mnc-dev

* commit '6058251939e417ed764d76fbde77eefc964d0ee6':
  More colors, now with material colors