Fix template upload.  Fix "Upcoming View" which would loop forever if there are not enough events (you now need to specify max num of days to go into future).  Change Week-num to date() and to "W", as strftimes "%V" doesnt work in Windows.