fixed calendar layout...
needs further testing on different devices
changed code to follow android naming conventions
Merge branch 'feature/fixCalendarLayout' into develop