Merge branch 'master' of github.com:MalucoMarinero/ng-tundra
Reformatted.
Merge branch 'master' into develop