copy change ticket
adds service times
whoops syntax error
syntax!
adjusts am/pm style
Merge branch 'develop' into sample-project