removing workaround for bug 2414
Merge branch 'master' into avaneesh
Added more time options

Added seconds, minutes, days and weeks to the time options in author
mode and put them in order of increasing length
Merge branch 'master' into jingxian2
Parametric function example