Adding search block to all pages
Adding Grunt, modification of styles and adding a new template class for rootController
Modification of the template bootstrap
Merging conflicts