added edittext popup window
Merge branch 'ObjectAndControllerClasses' of https://github.com/Team-CMPUT301F13T12/301-Project into ObjectAndControllerClasses

Conflicts:
	src/ualberta/g12/adventurecreator/EditFragmentActivity.java