tidy up, added object prooperty template
Merge branch 'master' of https://github.com/ecocache/ecocache