finished merge
added extra fields for DJ
Merge branch 'master' of riverton.dyndns.org:t3pio