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,