fixed error
Created the FragmentPartFactory and changed up the FragmentController and Fragment.  Now to make appropriate changes throughout the rest of the code.
Started changing the rest of the code to use the factory. Major debugging ahead.
Fixed bugs caused by refactoring (hopefully all)
Merge branch 'fragmentPartFactoryPatternRefactor' of https://github.com/Team-CMPUT301F13T12/301-Project

Conflicts:
	src/ualberta/g12/adventurecreator/FragmentEditActivity.java
minor clean up
Merge branch 'master' of https://github.com/Team-CMPUT301F13T12/301-Project

Conflicts:
	src/ualberta/g12/adventurecreator/controllers/FragmentController.java
	src/ualberta/g12/adventurecreator/views/EditChoiceActivity.java
	src/ualberta/g12/adventurecreator/views/FragmentEditActivity.java
Merge branch 'master' of https://github.com/Team-CMPUT301F13T12/301-Project