adapted for markyy-bs
Merge remote-tracking branch 'upstream_h5bp-bs-markyy/master'

Conflicts:
	.htaccess
	application/themes/default/css/main.css
	application/themes/default/js/vendor/jquery-1.9.1.min.js
	application/views/home.tpl
	application/views/layout.tpl
	humans.txt
adaptions for H5BP+BS Version