Remove json method from mock contact to allow inserting contact to accept dictionaries
PEP8 fixes
Fixed undefined variable issue with insert contact method
Import all classes so they can be used by other modules
Bumped version number to 0.6
test_bluetooth
test_bluetooth (review fixes, v1)
test_bluetooth_settings (review comments, update 2)
Merge pull request #363 from AaronMT/test_bluetooth_settings

test_bluetooth
Merge branch 'b2gbackup'
Merge branch 'master' into gps

Conflicts:
	gaiatest/tests/settings/manifest.ini