Modified .gitignore
Merge branch 'master' of lightair

Conflicts:
	app/views/newsletters/index.html.haml
Done with changes in Sidekiq
Merge branch 'master' of lightair

Conflicts:
	Gemfile
	app/controllers/users_controller.rb
	app/views/newsletters/_form.html.haml
	app/views/newsletters/index.html.haml
	app/workers/hard_worker.rb
Modified Newsletters index form
Merge branch 'master' of lightair

Conflicts:
	app/views/newsletters/_form.html.haml
	app/views/users/_form.html.haml
Set the final Layout