Merge branch 'master' of https://github.com/mmatczak/ng-directives-demystified

Conflicts:
	karma.conf.js