_pre merge
Merge origin/master

Conflicts:
	dist/css/style.css
	dist/js/app.js
	dist/js/compat/json.min.js
	dist/js/modernizr.min.js
	dist/js/p3.min.js
	dist/js/vendor.min.js