Added phloc dependency
Merge branch 'master' of https://git.soma.salesforce.com/aura/aura