Commit By aptana 3 project import
Merge branch 'master' of https://github.com/jcebidanes/Locadora