Fixes #30, Fixes #31
Merge branch 'i30-31'
Fix #25 again
Merge branch 'i25-refix'
Custom view for plan entries
Moved one xml to correct place, custom view for plan sections
Merge branch 'i29'
Closes #32
Merge pull request #33 from ironjan/master

Some fixes for errors in last pull request and some more issues