Integrating notification changes from main branch. Adding role based validation checks for view and controller. (Model is still pending)
Merge remote-tracking branch 'origin/amit' into amit

Conflicts:
	app/models/user.rb