First commit
master: merge with remote master, conflict resolved in .gitignore
master: AuthenticatorActivty and SignUpActivity with roboguice