Add quarter 'q' to format string
Change quarter format string to upper case Q
change name of quarterOfYear to quarter
Merge pull request #1311 from ericstob/develop

Add quarter 'q' to format string