Reverted
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/manifest-376efb8549ed394fcd3b4c6561a00e86.json
updated login view