Css changes in weeks and day to support hours display
Added time table in week and days to better display splitting into hours
Several modification in order to calculate the correct hours to display events
Exytra changes in the week view
weekly view
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/calendar.js
	tmpls/day.html
	tmpls/week.html
Fixed bug when displaying events
Merge remote-tracking branch 'origin/master'
Updates for weekly events