Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java
Merge lokaal2 into lok

Conflicts:
	src/main/java/be/vdab/entities/Lokatie.java
	src/main/java/be/vdab/web/LokatieController.java