funcionando con ngRoute por bower
Merge branch 'master-ui-router-migration' of https://github.com/javrod83/the_fram

Conflicts:
	bower.json
Merge branch 'master' into master-ui-router-migration
Merge branch 'master-ui-router-migration' of https://github.com/javrod83/the_fram into master-ui-router-migration