Include self resolving blocks for indicator-{datetime,session}, unity-lens-photos, compiz and unity to avoid file collisions with unity-language-pack
Merge remote-tracking branch 'shiznix/master'
error in merge