my commit
Merge branch 'master' of https://github.com/lvaras/sonar

Conflicts:
	themes/sonar/functions.php