Vuforia upload bij editStop
Merge remote-tracking branch 'origin/master'
Android style