activator + login
Merge branch 'dev' of github.com:GUTeamU/PSD3-Sprint3 into dev