some fixes on routing and created the vehicle form
Merge branch 'develop' of https://github.com/TeamSparklePony/FrontEnd into develop

Conflicts:
	app/mainView/franchisee/franchisee.js
fixed routes