addin routes for user/:username/discussions and hide all follow action if you are not logged
Merge remote branch 'origin/socialcoffee'
Changing the logo
Merge remote branch 'origin/socialcoffee'
Fixing logo size and removing the footer komfo brand
Merge remote branch 'origin/socialcoffee'
Merge branch 'master' of https://github.com/bdryanovski/sinatra_app
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
Merge branch 'master' of https://github.com/bdryanovski/sinatra_app
Hide Facebook Login btn
Addin validation
newlines
Merge branch 'socialcoffee' of https://github.com/bdryanovski/sinatra_app into socialcoffee

* 'socialcoffee' of https://github.com/bdryanovski/sinatra_app:
  Addin validation
Adding form validation on the request-invitation
addin validation and for the registration form
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
 Patching user req password-conf
Merge remote branch 'origin/socialcoffee'
Changing the Registration precedore now there is a link between user and there invitation