Development to master merge.

It's better to use public static final for hardcoded string "color".