Fixed padding for color picker
Merge branch 'edit_room'
Merge branch 'master' of github.com:fomaa/Calendar