Merge + make sure grunt is installed locally
SVG detection works