tabs
Merge remote-tracking branch 'upstream/master' into fix

Conflicts:
	app/views/vehicles/show.html.haml
tabs
fix delete item
Merge pull request #12 from irshad89/master

tabs