Small fixes and changes
Merge branch 'master' of github.com:AndreyGalkin/EdenForum