Merge remote-tracking branch 'origin/marcin-local' into marcin-local

# Conflicts:
#	app/lib/main.dart
#	app/pubspec.lock
#	app/pubspec.yaml