Misc
Merge branch 'master' of https://github.com/rweigel/datacache

Conflicts:
	plugins/default.js