color picker added
time picker added
merge
parse added