no message
toevoegen slider 20% outdoorjassen .NL .FR .LU
Merge branch '141217_AS_NL_FR_LU'

* 141217_AS_NL_FR_LU:
  toevoegen slider 20% outdoorjassen .NL .FR .LU
  no message

Conflicts:
	config.codekit: resolved by using master copy
	stylesheets/css/styles_de_uk.css: resolved by using master copy