validations for admin and retailer
validation for retailer on equipment and warranty show page
Merge branch 'new_feed_1237'

Conflicts:
	app/views/equipment/show.html.haml