Example
Merge branch 'master' into angulartics
Merge branch 'master' into angulartics

Conflicts:
	src/wp-content/themes/viradacultural/header.php
Merge header. Accepted  master version and added analytics plugin condition
Eventos de page view e algumas mudanças
Merge branch 'master' into angulartics

Conflicts:
	src/wp-content/themes/viradacultural/app/virada.js
Moved algulartics scripts to wp_enqueue
Angulartics changes and filterSpaces() function
Merge branch 'angulartics'

Conflicts:
	src/wp-content/themes/viradacultural/functions.php