mvc refactor
Merge branch 'planiphil-2.0' of https://github.com/avysel/planiphil.git into planiphil-2.0