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