Updating
Merge branch 'phonecontroller'
Changing to test.json