call scope.$apply on directive event listener
Merge branch 'master' of https://github.com/alannesta/angularScaffold

Conflicts:
	app/scripts/controllers/about.js