Add an appcache generator
Refactor some command code
Merge branch 'develop'