Add buttons to sign-up or -in
Merge branch 'develop'