Welcome screen to dashboard fix

Complete Flow
Merge remote-tracking branch 'origin/master'

Conflicts:
	Version 2/App/views/truckOwnerDashboard.html
	Version 2/App/views/truckOwnerEditProfile.html
	Version 2/App/views/truckOwnerProfile.html
	Version 2/App/views/userprofile.html