canvis Marc Juliol
Merge branch 'master' of github.com:UPCnet/ulearn.theme

Conflicts:
	ulearn/theme/stylesheets/ulearn.css
Canvis Marc
Canvis marc
Merge Marc changes
Merge branch 'master' of github.com:UPCnet/ulearn.theme into marc
Merge branch 'master' of github.com:UPCnet/ulearn.theme
Fixed CSS and SCSS generation
Merge branch 'marc'
Merge branch 'master' of github.com:UPCnet/ulearn.theme
Canvis Marc a Setembre