made changes to class names in models and changed abilities, so that the rails
admin engine now works properly for admin and moderator
Update location_data.rb
Added googlemap in dashboard
Merge pull request #40 from diceydawg/umass_branch

Added googlemap in dashboard
fixing dashboard controller

Latest pull request causes errors commented out the code for now
made changes to class names in models and changed abilities, so that the rails
admin engine now works properly for admin and moderator
Update location_data.rb
Added googlemap in dashboard
pre-pull 4/3/13
fixing dashboard controller

Latest pull request causes errors commented out the code for now
merging pull #2 4/3/13
trying to sort out db:seed error
removed extra DefaultsAndNulls migration
removed extra DefaultsAndNulls migration and added log
copied over the offending merge files