Add routes for equipment
Equipment
Merge branch 'master' of github.com:equipmap/equipmap into mas/equipment

Conflicts:
	config/routes.rb
Finish equipment
Merge pull request #4 from equipmap/mas/equipment

Equipment