Limpiando....
Nuevas annotations
Merge branch 'master' of github.com:FedeG/arena-abm-builder
Mergeando ...
Merge branch 'master' of github.com:FedeG/arena-abm-builder

Conflicts:
	src/main/java/annotations/CheckBox.java
	src/main/java/annotations/FieldDate.java
	src/main/java/annotations/FieldList.java
	src/main/java/annotations/FieldText.java
	src/main/java/annotations/FieldTime.java
	src/main/java/annotations/ListBox.java
	src/main/java/annotations/Option.java
	src/main/java/annotations/TextBox.java
	src/main/java/annotations/abm/AddMethod.java
	src/main/java/annotations/abm/EditMethod.java
	src/main/java/annotations/abm/EditMetod.java
	src/main/java/annotations/visualWidgets/PrimitiveAnnotation.java