Merge pull request #22 from alex-deaconu/master

Changes for Color Picker and Table Format