admin equipment application
Merge branch 'feature_zhou' of https://github.com/kevinzhoucn/RailsApp into feature_li

Conflicts:
	app/controllers/admin/equipment_controller.rb
	app/views/admin/equipment/_form.html.haml
	app/views/admin/equipment/edit.html.haml
	app/views/admin/equipment/index.html.haml
	app/views/admin/equipment/new.html.haml
	app/views/admin/equipment/show.html.haml
recovered from backups
20140622