#5 changed touchnet and edi
Merge branch 'oasban.#5' into dvlp