Fix locator for test_dialer
Reenable test_dialer
Fix gjslint problems prior to merging to Gaia
Merge pull request #237 from bobsilverberg/fix_dialer

Fix locator for test_dialer
Merge branch 'master' into call_log

Conflicts:
	gaiatest/tests/manifest.ini
	gaiatest/tests/test_dialer.py
Fix test_call_log_all_calls