Merge branch 'upstream-develop' into feature/loading-splash-screen

Conflicts:
	app/styles/main.css
Merge pull request #239 from jofomah/feature/loading-splash-screen

Feature/loading splash screen
Merge branch 'upstream-develop' into feature/email-auth
merged upstream