Refactor frontend / options classes
Code style fixes
Merge branch 'master' of https://github.com/Yoast/google-analytics-for-wordpress

Conflicts:
	frontend/class-frontend.php