[Task] custom modernizr
Merge branch 'master' of https://github.com/markusfalk/frontend-template-setup

Conflicts:
	bower.json