Cogwheel not needed, but an add users button is needed :) Closes #295
Merge branch 'master' into auth