story#23 - amir - jhatkaa customization - introduced custom field required by project

Conflicts:
	db/schema.rb
story#32 - amir - jhatkaa customization - the comments are not updatable once user signs petition, allowing this to happen based on feedback from BA. Updated existing specs for the change. Setting the country as india if the user is not nri.
amir - fix - setting default member count to zero since getting a NPE

Conflicts:
	spec/models/movement_spec.rb
amir - jhatkaa customization - changing from purpose specific email addresses to jhatkaa email addresses. externalizing most of the emails. changing failing specs.

Conflicts:
	app/mailers/purpose_mailer.rb
	app/mailers/sendgrid_mailer.rb
	app/models/autofire_email.rb
	config/constants.yml
	config/environments/production.rb
	config/initializers/devise.rb
	config/initializers/mail.rb
	spec/controllers/api/members_controller_spec.rb
	spec/models/action_page_spec.rb
	spec/models/sendgrid_mailer_spec.rb
amir - release - changing secret tokens

Conflicts:
	config/initializers/secret_token.rb
amir - release - adding clock tasks as rake to be run using heroku scheduler
amir - jhatkaa setup - adding seed data required by jhatkaa, removing languages not required by jhatkaa and removing setting up of umbrella email specific to purpose
amir - release - merging worker queues to save dyno hours

Conflicts:
	Procfile
amir - fix - redirecting via route path since not working in production
amir - release - making blast delay configurable
amir - jhatkaa customization - trying not to use solr based functionality to bring down dyno hrs. not displaying results based on search rather all the users

Conflicts:
	spec/controllers/admin/users_controller_spec.rb
amir - ignoring rbenv and generated binstub dir

Conflicts:
	.gitignore
amir - reading devise email using env variables

Conflicts:
	config/initializers/devise.rb
[john] - fixed tests