Merge branch 'develop' into version/2.0.0

Conflicts:
	_mercury.scss
	bower.json
Merge branch 'version/2.0.0' of github.com:agenceepsilon/sass-mercury into version/2.0.0