Merge pull request #103 from rail/v1.2

Bug 916911 - Create v1.2 branch in b2g-manifest and gaia