Update composer.json
cache fix
pathes fix
pathes fix
Merge branch 'master' into dev

Conflicts:
	composer.json
Resolved
Merge branch 'dev' of https://github.com/etconsilium/applejackyll into dev