Merge branch 'master' of github.com:toggl/toggldesktop