Merged Dave's changes

Calendar fix, new icon, weekly data entry enhancement, lightbox function