Merge branch 'views' of https://github.com/pedroaspiazu/ngbp-sass-nojquery

Conflicts:
	.idea/workspace.xml