refactored json data, calendarview example v 2.0 

Big merge incoming again! :)))