#import replaced with @import

Signed-off-by: Felix Gabel <felix.gabel@me.com>
small cleanup

Signed-off-by: Felix Gabel <felix.gabel@me.com>
animated scrolling when editing text in textView

Signed-off-by: Felix Gabel <felix.gabel@me.com>
Merge branch 'refs/heads/develop'