[feature/mixpanel] added mixpanel to settings
Merge remote-tracking branch 'origin/develop' into feature/mixpanel
Merge remote-tracking branch 'origin/develop' into feature/mixpanel
[feature/translations-16-7] updated translations for JS and update to translation pull script
Merge pull request #1433 from onepercentclub/feature/club-721

CLUB-721 - Handle login during order process
[feature/translations-16-7] merge fix;
Merge pull request #1434 from onepercentclub/feature/translations-16-7

Update to translation script  plus new translations
Update requirements.txt
CLUB-622 #resolve : Only show viewable project in MacroMicro xml
Merge pull request #1435 from onepercentclub/feature/club-622

CLUB-622 #resolve : Only show viewable projects in MacroMicro xml
Merge pull request #1432 from onepercentclub/feature/mixpanel

Feature/mixpanel
Merge remote-tracking branch 'origin/develop' into feature/club-721

Conflicts:
	requirements/requirements.txt