Merge branch 'socialpro' of http://github.com/bdryanovski/sinatra_app
Merge remote-tracking branch 'origin'

* origin:
Merge branch 'socialpro'

* socialpro:
  Robots txt
  Adding Stagging to the env list
Production env
addin routes for user/:username/discussions and hide all follow action if you are not logged
Changing the logo
Fixing logo size and removing the footer komfo brand
Changin mail
Merge branch 'master' of https://github.com/bdryanovski/sinatra_app

* 'master' of https://github.com/bdryanovski/sinatra_app:
  Production env
Changing email to be send when someone is trying to request invitation, also a typo into the mail template
Merge remote-tracking branch 'origin/master' into socialcoffee

* origin/master:
  Changing email to be send when someone is trying to request invitation, also a typo into the mail template
  Changin mail
  Production env
Hide Facebook Login btn