small fixes
Added logic for activity geolocation
fixed color picker
Merge branch 'deadline' of github.com:yarikus/ct-settings