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

Conflicts:
	design/bypakke/javascript/jquery.fitmaps.js