different small fixes
Merge branch 'master' into energine.ns
Merge branch 'energine.ns' into energine.ns.starter-bootstrap
added html5 boilerplate template
added minified modernizr.min.js exception
small boilerplate fixes
Merge branch 'energine.ns' into energine.ns.starter-bootstrap

Conflicts:
	starter/site/modules/main/transformers/energine.xslt
result of merge