my changes from this day
Merge branch 'master' of https://github.com/plipa/MDapp.git