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
This is for issue #311
Adding changes to send() to fix the capability of sending space.
Add test to verify music app with no songs
Update manifest
Add script to populate profile with resources for perf testing
Modification shift, alt, backspace, and caps lock functionality
deleted a space
Merge remote-tracking branch 'bebe/cards_view'

Conflicts:
	gaiatest/tests/manifest.ini
Improved the synchronous waits for contacts API and removed the need to be in the Contacts app
PEP8 fixes
Merge pull request #312 from ypwalter/sendFunction

This is for issue #311: Changing behavior of send() in keyboard class
Merge pull request #329 from rwood-moz/issue307

Add test to verify music app with no songs
Remove all contacts between tests. Fixes issue #341
Merge pull request #340 from davehunt/improve-contacts

Improve contacts
Merge branch 'master' of github.com:mozilla/gaia-ui-tests
Version bump