Fixed some bugs from merge.  Made Fragment and the fragment views follow MVC more closely.  Made the edit text popup in fragmenteditactivity multiline and scrollable.
Merge branch 'master' of https://github.com/Team-CMPUT301F13T12/301-Project