adding object content field
Merge branch 'master' of https://github.com/tproenca/guacaloco.git

Conflicts:
	guacaloco/src/guacaloco/model/VMwareEntity.java
first version of populate model