grunt-contrib-sass testing
Cleaning file
Merge branch 'develop' into feature/without-compass

Conflicts:
	Gruntfile.js
	assets/css/oldie.css
	assets/css/style.css
	assets/css/tiny.css
Tasks comment
Merge branch 'develop' into feature/without-compass

Conflicts:
	package.json
Watch task update

Compass task deleted
Sass task: update defaults options
.gitignore update
Merge branch 'develop' into feature/without-compass
Merge branch 'develop' into feature/without-compass
Merge branch 'develop' into feature/without-compass
Merge branch 'develop' into feature/without-compass
Merge branch 'feature/without-compass' into feature/v2

Conflicts:
	package.json