adding assets generate
Merge branch 'master' into testing
accidentally changed composer.json version of sprockets
Merge branch 'master' into testing

Conflicts:
	composer.json
Merge branch 'master' of github.com:CodeSleeve/asset-pipeline