dashboard changed for admin
activity log changed
changes to activity log
changes to questions to include highlights
Index of users changed
Merge branch 'master' of https://github.com/mdk199/rorproject into potali-activity-log

Conflicts:
	db/schema.rb
datatable added
changes to add datatable
datatable added to activity log
added tests for admin user links
question controller spec added
changes to question_controller spec
tag_maintenance being added
tag management added to admin role
changes to admin_spec
changes to schema
merge issue resolved
Merge branch 'master' of https://github.com/mdk199/rorproject into potali-flagfeature

Conflicts:
	app/views/layouts/dashboard.html.erb
	spec/features/admin_spec.rb