Version from rb
Renamed cms.components to components
Added additional services, taglibs and deps
Merged changes, modified .gitignore