grr
Merge remote-tracking branch 'origin'
Fixed most things, changed NSint to int in List to get rid of some warnings here and there