added base day object
Added new objects and enhanced day template
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Still working on objects
Merge remote-tracking branch 'origin/master'