Merge pull request #141 from klindenbach/master

Converted DBHandler tests to new format
Changed listview so that elements align to top
#93 implemented delete methods in ESHandler
#137 Added JavaDoc HTML for main project
Merge pull request #146 from klindenbach/ListViewTweak

Changed listview so that elements align to top
Merge pull request #148 from klindenbach/137-JavaDoc-Class-Patterns

#137 Added JavaDoc HTML for main project
21,000 additions
Merge pull request #147 from klindenbach/93-ES-Delete

Implemented ES Delete Methods
Urgent fix for null-pointer exception when no response is found in ES
Merge pull request #152 from klindenbach/ES-Down-Fix

Urgent fix for null-pointer exception when no response is found in ES
#138 Implemented help popups for edit/read page
#138 Added help to menu for other 2 activities
#138 Added help text for other 2 activities
Merge pull request #153 from klindenbach/138-Help-popups

#138 help popups
Made code more consistent by moving functions
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/EditStoryActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Please work
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into unitTestBranch

Conflicts:
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/TestViewPageActivity.java
Merge pull request #154 from moorej12/master

Cleaned up code some
Merge pull request #155 from KarlParkinson/unitTestBranch

Unit test branch
Sample Story