no message
Merge branch 'master' of https://github.com/ColdSauce/CosmosBrowserFirefoxOS

Conflicts:
	Cosmos/manifest.webapp