Disable transition x transform pending spec for navigation flows vs. modal windows
Merge branch 'master' of github.com:mozillafordevelopment/mobile-appmaker
Merge branch 'master' of github.com:mozillafordevelopment/mobile-appmaker
[#154] Add i18n filter
Merge pull request #181 from errietta/issue154

[#154] Add i18n filter
[#155] Select major colour, too.
Merge branch 'master' of github.com:mozillafordevelopment/mobile-appmaker
Merge pull request #184 from errietta/issue155

[#155] Select major colour, too.
[#183] fix scrolling on apps and templates
[#165] Update tabBar

Update tabBar with the .svg images provided.
[Fix #103] Consolidate headline and paragraph
Merge pull request #190 from errietta/issue183

[#183] fix scrolling on apps and templates
Merge pull request #192 from k88hudson/103

[Fix #103] Consolidate headline and paragraph
[Fix #167] Add new button styles
[Fix #169] Update header styles
Merge pull request #199 from k88hudson/167

UI updates
Merge pull request #191 from ryandang/issue165

[#165] Update tabBar
[#200] Fix segmented control bug
Merge branch 'master' of github.com:mozillafordevelopment/mobile-appmaker
Merge branch 'issue200' of git://github.com/ryandang/mobile-appmaker into r