Initial commit
Agregadas Entitades base
 On branch master
 Changes to be committed:
	modified:   .gitignore
	new file:   base/src/main/java/com/c1s/bitblend/amigo/base/entity/ActiveModule.java
	new file:   base/src/main/java/com/c1s/bitblend/amigo/base/entity/Module.java
	modified:   base/src/main/java/com/c1s/bitblend/amigo/base/entity/Organization.java
	modified:   base/src/main/java/com/c1s/bitblend/amigo/base/entity/Person.java
	new file:   base/src/main/java/com/c1s/bitblend/amigo/base/entity/Profile.java
	new file:   base/src/main/java/com/c1s/bitblend/amigo/base/entity/Role.java
	modified:   base/src/main/java/com/c1s/bitblend/amigo/base/entity/User.java
	new file:   docs/entities/entityRD.uml
Merge branch 'master' of https://github.com/jorgemorando/amigo2

Conflicts:
	base/src/main/java/com/c1s/bitblend/amigo/base/entity/Organization.java
	base/src/main/java/com/c1s/bitblend/amigo/base/entity/Person.java
	base/src/main/java/com/c1s/bitblend/amigo/base/entity/User.java