PRosjekt visning
Merge branch 'master' of https://github.com/vangenplotz/vp_bypakke

Conflicts:
	design/bypakke/override/templates/full/project.tpl
	design/bypakke/stylesheets/style.less
	settings/siteaccess/bypakke/design.ini.append.php
	settings/siteaccess/bypakke/ezjscore.ini
Merge branch 'master' of https://github.com/vangenplotz/vp_bypakke

Conflicts:
	design/bypakke/images/prosjekt_liste_icons.png
	design/bypakke/javascript/jquery.colorbox-no.js
	design/bypakke/javascript/jquery.dataTables.columnFilter.js
	design/bypakke/javascript/jquery.tablesorter.js
	design/bypakke/javascript/vendor/flexslider/flexslider.css
	design/bypakke/override/templates/full/Copy of project_list.tpl
	design/bypakke/override/templates/full/datatables_project.tpl
	design/bypakke/override/templates/full/project.tpl
	design/bypakke/override/templates/full/project_list.tpl
	design/bypakke/stylesheets/flexslider.css
	design/bypakke/stylesheets/style.less
	settings/siteaccess/bypakke/design.ini.append.php