Bug 1107831 - Update the FTE with the new assets and colors
Merge pull request #366 from rnowm/1107831

Bug 1107831 - Update the FTE with the new assets and colors r=borja
Bug 1109630 - Improve and Refactor grunt system
Merge pull request #382 from dcoloma/grunt-refactor

Bug 1109630 - Improve and Refactor grunt system
Bug 1097715 - Implement join room screen