Use abbreviated state names
add real upcaming and completed jobs
Merge pull request #24 from laudeego/em-mechanic-dashboard-upcoming-jobs

add real upcaming and completed jobs
User appointments page
Fixed button margins
Merge pull request #25 from laudeego/an-html-template-for-userappointments

User appointments page
User estimates page
Merge pull request #27 from laudeego/an-html-template-for-userestimates

User estimates page
Merge branch 'master' into task_itemization

Conflicts:
	app/models/jobs/job.rb
	db/schema.rb