angular 1.2.14 + refactor de modulos
Merge pull request #18 from GangOfFive/angularUpdate

angular 1.2.14 + refactor de modulos
Arreglar conflictos