fixed error in TestSHController, also renamed it to that
fixes to testSHController, fixes to story manager and controller due to addition of phone id
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard