Merge pull request #1 from mvargeson/develop

Clean resource directory
Merge pull request #2 from mvargeson/develop

Add resource expansion and update composer.json
no message
Merge branch 'cache' into develop

Conflicts:
	composer.json
updated with cache