local changes on ORM
Merge branch 'master' of https://github.com/wlisesrivas/coffeeORM

Conflicts:
	src/com/coffeeorm/orm/CoffeeORM.java
fixing