Final commit to master
Resolved conflicts for thumbnails
Resolved conflictws for all component's integration
Updated navbar.css