Fixed space
Displaying annotations is fixed, adding editText views cause crashes now.. possibly due to the view being passed into the the display method.
Merge branch 'master' of https://github.com/CMPUT301F13T06/ClassProject