Initial work
Merge branch 'Storage' into pbkdf

Conflicts:
	cache.appcache
	controllers/generate.js