Merge branch 'import-error-fix'
Fixed issue with the login button
Updated addMark method to not set label_id if less than 1
Merge branch '21-0-bug'
Merge branch 'staging' of github.com:plainmade/unmark into staging
Added a comment
Merge branch '21-0-bug'
Merge branch 'master' into staging