merged conflicts

Merge branch 'master' into HDPDGI-34-1

Conflicts:
	dashboard/v2/public/css/common.css
	dashboard/v2/public/modules/details/views/attribute.html
	dashboard/v2/public/modules/details/views/details.html
	dashboard/v2/public/modules/details/views/schema.html
	dashboard/v2/public/modules/home/views/header.html
	dashboard/v2/public/modules/lineage/lineageController.js
	dashboard/v2/public/modules/navigation/navigationController.js
	dashboard/v2/public/modules/navigation/navigationModule.js
	dashboard/v2/public/modules/search/searchController.js
	dashboard/v2/public/modules/search/searchRoutes.js
	dashboard/v2/public/modules/search/views/search.html
	dashboard/v2/public/modules/search/views/searchResult.html
	dashboard/v2/public/views/includes/foot.html
	dashboard/v2/public/views/includes/head.html