Merge branch 'master' of /Users/valtechuk/Dev/ClaimCapture with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Refactored templates and date components