test cards view with three apps
Merge remote-tracking branch 'mozilla/master' into cards_view
Add app list and app dict
Remove test_that_app_can_be_launched_from_cards_view(
add moztrap links
Merge remote-tracking branch 'bebe/cards_view'

Conflicts:
	gaiatest/tests/manifest.ini