Refactoring.
Merge branch '0.6' of git://github.com/ufik/WebCMS2 into 0.6