Merge remote-tracking branch 'origin/i-li' into d-zonov
Before merge
Before merge again
Added side panel of categories
Added bean
Preparing for merging
Added configuration from spring-source
Added sample flows from springsource
Preparing for merging.
Added resources
Merged version
Merge remote-tracking branch 'origin/d-zonov' into i-li
Added updating for categories.