- blubb
Merge branch 'dev' of https://github.com/Prototype-Group/css3-animation-showcase into dev

Conflicts:
	_output/css/styles-png.css.map
	_output/css/styles-svg.css.map
Merge branch 'dev' of https://github.com/Prototype-Group/css3-animation-showcase into dev