Merge branch 'signup' into develop