merging
Merge branch 'master' of https://github.com/hernangm/SquishIt

Conflicts:
	.gitignore
	SquishIt.Framework/Base/BundleBase.Rendering.Internals.cs
	SquishIt.Framework/SquishIt.Framework.csproj
	SquishIt.Less/LessPreprocessor.cs
	SquishIt.sln
	SquishItAspNetTest/SquishItAspNetTest.csproj