Merging updates from other branches into develop

Opening another pull request to pick up changes from login-status-and-dashboard and new-workout-page-and-forms (since those went into rest-testing) into develop.