integrates bootstrap

Conflicts:
	src/collective/generic/skel/buildout/plone/tmpl/etc/templates/www/apache.reverseproxy.conf.in_tmpl