update
Merge branch 'master' of https://github.com/indikman/truecode-DJ