Lots fixes and some additional fuctionality
Merge branch 'develop' of https://github.com/ksbomj/mini.cms into develop