Merge pull request #5 from rcrl3/master

Calendar Tabs & Color picker
Formatting updates
Added template