Custom view for plan entries
Moved one xml to correct place, custom view for plan sections
Merge branch 'i29'