Bug 933815 - Added marketplace smoketests and updated manifest file

Updated marketplace launch test and functional manifest.ini

fixed manifest.ini ordering
Merge branch '933815' of https://github.com/singhkaran/gaia into 933815