Merge pull request #33 from diceydawg/umass_branch

Some additions
added admin approval for user accounts, and also finished making changes to abilities
till solution for moderators is found
Merge branch 'umass_branch' of https://github.com/jjliang/databaseui into umass_branch

Conflicts:
	app/models/non_iti.rb
	log/development.log
fixed conflicts,
finished defining abilities. However, Rails_admin no longer lists all the models
created a seed file to default a foodwebbuilder@gmail.com user that is approved by default
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