Adding in collection.* token attributes
Fixing bug in last commit (collection token attributes)
Additional am/pm fix in calendar feeds
Correcting end times (0 is 24)
Merge remote branch 'origin/release' into lightweight_queue