Fixed some errors in push/pull preocedures, some more TODO items
Updating public site/branch from local master

* master:
  Fixed some errors in push/pull preocedures, some more TODO items