YH-223: migrate to bootstrap3
Merge branch 'master' of https://github.com/yhteentoimivuuspalvelut/ytp-assets-common into HEAD

Conflicts:
	resources/styles/main.css
	resources/templates/head-styles-drupal.html
	resources/templates/head-styles.html
	src/less/ckan.less