some other changes
Merge branch 'master' of https://github.com/saulovenancio/AngularJS-TDC2014