Anny's code
Merge branch 'master' of https://github.com/mcalderon/GBQ

Conflicts:
	www/sass/sass/partials/_icons.sass
Latest changes.