Add references in all scopes with includes
Merge branch 'rails4' of github.com:francocatena/mawida_app into rails4