included
Merge branch 'master' of github.com:mgechev/angularjs-style-guide

* 'master' of github.com:mgechev/angularjs-style-guide:
  s/controller/filter
Updated polish translation
Merge pull request #36 from lukaszklis/pl_update

Updated polish translation
Improve formatting and include example for classical inheritance
adding french translation
translate the second part in french too.
Merge pull request #37 from opendena/master

French translation for angular-style-guide
Setting the theird parameter of  to false
Merge branch 'master' of github.com:mgechev/angularjs-style-guide

* 'master' of github.com:mgechev/angularjs-style-guide:
  translate the second part in french too.
  adding french translation
Reference to Airbnb style guide added
Update README-pt-br.md

Adicionada recomendação de uso do $interval em relação ao setInterval
Update README.md

Use of $interval instead of setInterval() in angular >= 1.2.x
http://docs.angularjs.org/api/ngMock.$interval
Merge pull request #40 from cavarzan/patch-2

Use of $interval instead of setInterval() in angular >= 1.2.x
Merge pull request #39 from cavarzan/patch-1

Update README-pt-br.md
Fix pluralization, grammar, and typos.
Merge pull request #41 from jordanyee/master

Fix Pluralization, Grammar, and Typos
Merge branch 'master' into german_translation
synchronize de with en