Merge pull request #16 from NationalMuseumofDenmark/master

Update testing with search view adjustments
Merge branch 'master' into testing
Increased page_size
Moved update flag to ensure that we do not call this function several times.
Merge branch 'master' into testing

Conflicts:
	app/scripts/app.js
Moved css include to the template
Merge branch 'master' into testing

Conflicts:
	app/views/index.jade
Add bootstrap variables file with basic adjustments. Update main.scss accordingly.
Merge branch 'master' into testing
Add columns to asset view. Move css link to mixins. Some color adjustments.
Merge branch 'master' into testing
Merge branch 'master' into testing
Merge branch 'master' into testing

Conflicts:
	lib/controllers/search.js
Merge branch 'master' into testing
Add bootstrap variables file with basic adjustments. Update main.scss accordingly.
Add columns to asset view. Move css link to mixins. Some color adjustments.
Merging branch with updated testing code

Merge branch 'FrontendDesign#15202477' of https://github.com/NationalMuseumofDenmark/headnet.node.project.natmus-samlinger into FrontendDesign#15202477

Append latest changes in assets view to frontend design changes. LP#15202477

Conflicts:
	app/views/asset.jade
Merge pull request #17 from NationalMuseumofDenmark/FrontendDesign#15202477

Frontend design#15202477