Merged recent changes from Davinci
Some more changes from davinci
Merge commit '72b427b8cfc3b27bcdcb2563076254b18fcbf37a'
Merging changes from various PR:

  - https://github.com/WiserTogether/paas-skeleton/pull/5
  - https://github.com/easel/paas-skeleton/pull/5