little fix in header & footer + integrated other things
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/header.php
	styles/SASS.css