Changed to display current month and year rather than hard code a specific calendar
Merge branch 'master' of https://github.com/eTendance/main