added jobsite_id and customer_id to all the required forms
merge conflict removed