Connecting Rails with the dashboard
Dashboard fixes
merging with dasboard
 fixed conflicts