Merge branch 'develop'
some separation on staging and production
add mail broadcast
Merge branch 'develop'
add sidekiq web
Merge branch 'develop'
add subject to mailers
Merge branch 'develop'
add sinatra gem for sidekiq web view
Merge branch 'develop'
comb winners info
add more info about winners
add hat text to users/new
update main page
add sharing buttons
add social buttons to main page
Merge branch 'release/0.8.7'

* release/0.8.7:
  add social buttons to main page
  add sharing buttons
  edit database.yml for test env
  remove username from test env
  update main page
  add hat text to users/new
  add more info about winners
  comb winners info

Conflicts:
	app/views/web/welcome/index.html.haml
edit meta on news show
Merge branch 'release/0.8.8'

* release/0.8.8:
  edit meta on news show
Merge tag '0.8.8' into develop

Comb meta tags

* tag '0.8.8':
  update main page
  add hat text to users/new
  add more info about winners
  comb winners info
  add sinatra gem for sidekiq web view
  add subject to mailers
  add sidekiq web
  add mail broadcast
  some separation on staging and production