cp
cp
Merge branch 'master' into better-caching

Conflicts:
	lib.js
cp
another bug down
working
cleaning
Merge branch 'better-caching'