fixed glitch causing exception to be thrown if a shift is created for a calendar with no lock date set
Merge branch '2.0'