Feature/login activity

We're going to merge the current login activity into master so we can start making new branches for the current milestones.