Merge branch 'master' into '18-design-feedback-page-2'

# Conflicts:
#   src/app/app-routing.module.ts
#   src/app/app.component.ts
#   src/app/hirebike/hirebike.page.ts

src/app/reset-password/reset-password.page.ts

+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-reset-password',
+  templateUrl: './reset-password.page.html',
+  styleUrls: ['./reset-password.page.scss'],
+})
+export class ResetPasswordPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}