Added files that were missing that caused issues on pull.
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08

Conflicts:
	Team08StoryApp/bin/classes/AndroidManifest.xml
	Team08StoryApp/bin/classes/res/values/strings.xml

Removing files that should not be pushed up to repo
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08
Removed test classes of models as there are no tests needed to be done for these and thus are not needed.