commiting in order to get the new changes to merge with my code
Merged changes with server code
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08

Conflicts:
	Team08StoryApp/src/com/team08storyapp/EditFragmentActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08