Merge pull request #80 from CMPUT301F13T05/annotations

Annotations
fixed user editing
added login user identification... You can now log in with the same username as before and edit a story without it adding you as a editor....
fixed editing error
fixed local copy problem
Merge pull request #81 from CMPUT301F13T05/annotations

Sort update
added help
Merge branch 'master' of https://github.com/CMPUT301F13T05/Team05_CYOA
Merge pull request #82 from CMPUT301F13T05/annotations

Fixed error with new choices
Merge branch 'master' of https://github.com/CMPUT301F13T05/Team05_CYOA
fixed user log in
fixed photo caputre
added help in ennotation screen
Annotations now are Server loaded
Fix merge conflicts