Resource management refactored
Merge branch 'master' of git://github.com/gabre/calendar-repo