Bug 969556 - Fix break of keon v1.3 builds; r=mwu
Merge pull request #149 from comoyo/keon-1.3-fix

Bug 969556 - Fix break of keon v1.3 builds; r=mwu
Bug 972318 - Revert platform_build to gp-b2g master for peak. r=hwine
Merge pull request #151 from comoyo/peak-1.3-fix

Bug 972318 - Revert platform_build to gp-b2g master for peak. r=hwine
Merge branch 'v1.3' into v1.3t

Conflicts:
	keon.xml
	peak.xml