Merge branch 'master' of https://github.com/IGRACH/Template-1.06

Conflicts:
	sass/default/_defaultvalues.scss
	sass/main.css