some calib attmepts;
merged
added CalendarManager, menu, content + ABC plans
merged shit
Merge branch 'hady' into jmeprototype