User model code cleanup
Not notify about self changes
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  Not notify about self changes
  User model code cleanup

Conflicts:
	app/models/user.rb