update help, annotate and comments
Merge branch 'master' of https://github.com/Team-CMPUT301F13T12/301-Project

Conflicts:
	src/ualberta/g12/adventurecreator/views/FragmentViewActivity.java

	modified:   res/layout/activity_fragment_viewer.xml
	modified:   src/ualberta/g12/adventurecreator/data/Story.java
	modified:   src/ualberta/g12/adventurecreator/tasks/CacheStoryTask.java
	modified:   src/ualberta/g12/adventurecreator/tasks/DownloadStoryTask.java
	modified:   src/ualberta/g12/adventurecreator/tasks/DownloadTitleAuthorsTask.java
	modified:   src/ualberta/g12/adventurecreator/tasks/PublishStoryTask.java
	modified:   src/ualberta/g12/adventurecreator/tasks/TryPublishStoryTask.java
	modified:   src/ualberta/g12/adventurecreator/views/FragmentViewActivity.java
	modified:   src/ualberta/g12/adventurecreator/views/OView.java
	new file:   test-test/build.xml
	modified:   test-test/project.properties
	modified:   test-test/src/ualberta/g12/adventurecreator/test/AdventureApplicationTest.java
	modified:   test-test/src/ualberta/g12/adventurecreator/test/EditFragmentActivityTestCases.java
	modified:   test-test/src/ualberta/g12/adventurecreator/test/EditStoryActivityTestCases.java
	modified:   test-test/src/ualberta/g12/adventurecreator/test/MainActivityTestCases.java
	modified:   test-test/src/ualberta/g12/adventurecreator/test/StoryControllerTest.java
	modified:   test-test/src/ualberta/g12/adventurecreator/test/StoryFragmentControllerTestCases.java
	modified:   test-test/src/ualberta/g12/adventurecreator/test/StoryListControllerTestCases.java
	modified:   test-test/src/ualberta/g12/adventurecreator/test/StoryListTest.java
	new file:   test-test/src/ualberta/g12/adventurecreator/uitests/BasicUiTests.java