now use FxOS building blocks
Merge branch 'erwan' into gh-pages

Conflicts:
	design.css
add appcache
Merge branch 'erwan' into gh-pages