Changes to component mapping procedure.
Added component mapper. Now component holder is separated from the mapping
process.
Merge origin/viewManagerEnhancement into viewManagerEnhancement