del plan.txt
Merge branch 'master' into ldev
readme change