support for cache of js and css locals
Merge branch 'refs/heads/cache_support' into dev

Conflicts:
	middleware.js