Working with price corrected
datepicker is fixed
Merge branch 'develop'