Before merging
Merge branch 'master' into multisalon

Code added for Master branch into Multisalon branch and currently HEAD
is point to multisalon branch
Commit msg == After merging of Master into multisalon