Controllers pt.1
Controllers
Merge remote-tracking branch 'origin/JteMergeEZ' into DimBranch

Conflicts:
	.target/Global.class
	.target/models/Activity.class
	.target/models/AmmunitionType.class
	.target/models/Animal.class
	.target/models/Comment.class
	.target/models/Fishing.class
	.target/models/Location.class
	.target/models/Picking.class
	.target/models/User.class
	.target/models/Weapon.class
	app/Global.java
	app/controllers/MorphiaObject.java
	app/models/Activity.java
	app/models/AmmunitionType.java
	app/models/Animal.java
	app/models/Comment.java
	app/models/Fishing.java
	app/models/FishingEquipment.java
	app/models/HuntingEquipment.java
	app/models/Location.java
	app/models/Organism.java
	app/models/Picking.java
	app/models/PickingEquipment.java
	app/models/Plant.java
	app/models/User.java
	app/models/Weapon.java

merge model
Merge
Control
Control
c
Merge branch 'DimBranch' into JteMergeEZ

Conflicts:
	app/controllers/Activity.java
	app/models/AbstractActivity.java
	app/models/FishingActivity.java
	app/models/FishingSector.java
	app/models/HuntingActivity.java
	app/models/HuntingSector.java
	app/models/PickingSector.java