Changed UI. Allowed color selection.
Moving to Fragments. Lots of errors
Merge remote-tracking branch 'origin/master'