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

Conflicts:
	design/bypakke/override/templates/block/kampanje_slider.tpl