https://www.pivotaltracker.com/story/show/48617417 in progress
Merge branch 'dev_restrict_date_range_48617417' into develop