Minor changes
Merge branch 'javacv_test' of github.com:Quadroid-Wildau/Quadroid-Traeger into javacv_test