Handmade Merge Klara's commit ,,Planner added,, (Apr 16, 2014)