Bug 976535 - [FTE] Refactor tutorial r=fcampo, ejchen