Revert "Merge branch 'master' of https://github.com/Team-CMPUT301F13T12/301-Project"

This reverts commit 4f3f299105c0cfe3a3739f43a961bd74dc3772cc, reversing
changes made to 1a20ebc2c602b627dbec53f501fe5f63ea89e94b.
Fixing Master
Conflicts:
	src/ualberta/g12/adventurecreator/controllers/FragmentController.java
	src/ualberta/g12/adventurecreator/data/Fragment.java
	src/ualberta/g12/adventurecreator/views/ChoiceEditActivity.java
	src/ualberta/g12/adventurecreator/views/EditChoiceActivity.java
	src/ualberta/g12/adventurecreator/views/FragmentEditActivity.java