Merge branch 'develop'
fix tracking image
fix copy&paste fault
Merge branch 'Flyingmana-patch-2' into develop