Conflict with latest version of react-admin#5

leoafarias wants to merge 3 commits intovascofg:betavascofg/react-admin-color-input:betafrom

leoafarias:masterleoafarias/react-admin-color-input:masterCopy head branch name to clipboard