annotation changed to property-based
Merge branch 'master' of https://github.com/qcri-social/AIDR

Conflicts:
	aidr-db-manager/src/main/java/qa/qcri/aidr/dbmanager/entities/model/Model.java
	aidr-db-manager/src/main/java/qa/qcri/aidr/dbmanager/entities/model/ModelFamily.java