Merged conflict.
finishing calendar features
Merge remote-tracking branch 'origin/update-farhan' into update-sharvy
fixing schedule color on table
fixing schedule color on table
Merge remote-tracking branch 'origin/update-farhan' into update-sharvy
Amount deducted from seekers account when schedule has been approved.
Social sign up  uniqueness check and email verification check
Merge branch 'update-sharvy' into dev

Conflicts:
	db/schema.rb
Social sign up  uniqueness check and email verification check