Dev branch

Merged Rahul A. Sutar requested to merge DevBranch into stagingbranch
  1. Jun 20, 2017
  2. Jun 19, 2017