* Ink view now draws in the correct place after scrolling
Merge remote-tracking branch 'origin/master'