fix weekday after next
change interpretation of after next
Merge branch 'jw2013-master' into develop