Merge pull request #23 from cnlpete/development

[3.1] Cache handler and first idea for administration controller