change in table structure
small change in equipment file
Merge branch 'bootstrap_views'