Merge branch 'master' of https://github.com/voorhoede/car-ux

Conflicts:
	source/assets/images/grunticon-output/icons.data.png.css
	source/assets/images/grunticon-output/icons.data.svg.css
	source/assets/images/grunticon-output/png/gplus-yellow-black.png
	source/assets/images/grunticon-output/png/gplus.png
	source/assets/images/grunticon-output/png/twitter-yellow-black.png
	source/assets/images/grunticon-output/png/twitter.png
	source/assets/images/grunticon-svgs/facebook-yellow-black.svg
	source/assets/images/grunticon-svgs/facebook.svg
	source/assets/images/grunticon-svgs/gplus-yellow-black.svg
	source/assets/images/grunticon-svgs/gplus.svg
	source/assets/images/grunticon-svgs/twitter-yellow-black.svg
	source/assets/images/grunticon-svgs/twitter.svg
Merge branch 'master' of https://github.com/voorhoede/car-ux

Conflicts:
	source/assets/images/grunticon-output/icons.data.png.css
	source/assets/images/grunticon-output/icons.data.svg.css
	source/assets/images/grunticon-output/png/facebook-yellow-black.png
	source/assets/images/grunticon-output/png/facebook.png
	source/assets/images/grunticon-output/png/gplus-yellow-black.png
	source/assets/images/grunticon-output/png/gplus.png
	source/assets/images/grunticon-output/png/twitter-yellow-black.png
	source/assets/images/grunticon-output/png/twitter.png
	source/assets/images/grunticon-svgs/facebook-yellow-black.svg
	source/assets/images/grunticon-svgs/facebook.svg
	source/assets/images/grunticon-svgs/gplus-yellow-black.svg
	source/assets/images/grunticon-svgs/gplus.svg
	source/assets/images/grunticon-svgs/twitter-yellow-black.svg
	source/assets/images/grunticon-svgs/twitter.svg
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/assets/images/grunticon-output/icons.data.png.css
	source/assets/images/grunticon-output/icons.data.svg.css
	source/assets/images/grunticon-output/png/facebook-yellow-black.png
	source/assets/images/grunticon-output/png/gplus-yellow-black.png
	source/assets/images/grunticon-output/png/twitter-yellow-black.png
	source/assets/images/grunticon-output/png/twitter.png