(Hopefully) fixed L13 text view getting cut off. (an iOS 7 error)
Also some int -> NSInteger thingammies
Merge remote-tracking branch 'origin/BugFixesBeta' into BugFixesBeta