Merge remote-tracking branch 'origin/master' into update_controller_and_views_with_localisation
ajout de poll_mailer
une notification est envoyée lors d'un nouveau poll
Merge remote-tracking branch 'origin/first-ui' into local_send_notification_with_poll_event

Conflicts:
	Gemfile.lock
	app/views/groups/index.html.erb
	app/views/groups/show.html.erb
	app/views/restaurants/index.html.erb
	app/views/restaurants/show.html.erb
	spec/factories/groups.rb
	spec/factories/polls.rb
	spec/factories/users.rb
-bug fix in PollController#save_vote
-removed email logic in poll controller
added resque and resque-scheduler gems
-poll_mailer + test without mail bodies
-email notification logic in Poll model + tests
-poll_mailer now use resque_mailer
-fix in polls_controler_spec
-bug fix with poll method is_active? (missing ? in some place)
-mount resque/server in louise
merge with angular-poll branch
mount resquer-scheduler web app in louise
mailer optimisation for resque
-added a body for pollMailer mails
-fix when calling mailer, was still passing user object instead of user_id
-removed ENV var in mailers
-from and send_to now use default variable in config
bug fix in 10% of poll active time from end calculation
bug fix, current_user was not registered as a member of the group when creating it
removed unused code in rake resque:setup
removed pending notifications when destroying a poll
bug fix: ending email subject is always showing 1 hour
bug fix: vote is working properly
fixed poll_mailer.rb tests