cleaned up
Merge https://github.com/Shaban/to4go-cms
cleaned up