Preparing for merging
Preparing for merging.
Merged version
Merge remote-tracking branch 'origin/d-zonov' into i-li
Added updating for categories.
Before merge
New beans and controller.
Before merge. Rewrited by right example from Pro Spring 3
Some version with CDATA errro