Merge remote-tracking branch 'origin/feature/team_creation_notification' into stg_master3
Merge remote-tracking branch 'origin/fix/limit_company_name_length' into stg_master3
Merge remote-tracking branch 'origin/ian-header-subnav' into stg_master3
-Commit all the styles
-Save credentials
Merge branch 'fix/carousel_styling' into stg_master3
-Adding dist files
Merge branch 'fix/carousel_flipping' into stg_master3
-Add newly disted files
- Comment out a migration for now
-Uncomment migration
-Comment in the migration
- Change the slug migration
Merge branch 'master' into stg_master3
Merge branch 'feature/login_front_page' into stg_master3

Conflicts:
	ahgl/static/js/app/app/styles/main.css
-Adding disted files
Merge branch 'feature/change_game_tournament_structure' into stg_master3
Merge branch 'feature/change_game_tournament_structure' into stg_master3
-Commit static assets
Merge branch 'fix/subheader' into stg_master3