Merge branch 'hotfix/print_event_tracking'
add back in $scope.gaEvent() because it is called from the view
Merge branch 'hotfix/re-add_ga_method' into develop