Merge branch 'master' into em-pick-mechanic-schedule

Conflicts:
	spec/features/users/appointment_spec.rb
User: selection mechanic by schedule - new user notification email

update email text from issue with user notifications emails
fix tests
fix bug with method callind queue