finalize
Merge branch 'mikkelvba' of https://github.com/M2CD/BrdrSejr into mikkelvba

Conflicts:
	born46Jacket.php
	jackets.php
	mcwebshop.php
Merge branch 'mikkelvba'