fixed rollback
Merge branch 'master' of https://github.com/demosophy/Demosophy

merge php and html