test push
verwijderen JUnit

Change-Id: I09a8907c8bbae165a42b21b7cf8afc1ef5b79dca
Change-Id: Ib072c198a0cd68d306136a5b0ab4d8eeab98519c
Merge branch 'napull'

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.component
	src/main/java/be/vdab/dao/AbstractDAO.java
	src/main/java/be/vdab/dao/DocentDAO.java

Change-Id: I649fa0f08d5d84f69da0821a44032622bbc632c2
Change-Id: I7aaa5d2c99fbbb1f9f9ed04ae23119f15d598b7b
Change-Id: Idae00d278aee250c661ddb6d561f6277be26af39
new entity: Boek

Change-Id: I9ffa7c584bcef3e8bf2cf124139a8babe984c6dd
TalenPerLand

Change-Id: I34949cd809db9b414a3bccc80984813c980fdc94
HS 15

Change-Id: I5a68e95e92206b26d0fa44b143266bde06b9a25c
Nieuwe entities: cursussen

Change-Id: I017d102cc3b2422a3abcc40298cd6d9816af368b
use case: cursus met naam

Change-Id: Iffebe921799a81add4f2fe640bab53b627d96dab
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/vdab/dao/CursusDAO.java
	src/main/java/be/vdab/entities/Cursus.java
	src/main/java/be/vdab/entities/KlassikaleCursus.java
	src/main/java/be/vdab/entities/ZelfstudieCursus.java
	src/main/java/be/vdab/services/CursusService.java
	src/main/java/be/vdab/servlets/CursussenMetNaamServlet.java
	src/main/resources/META-INF/orm.xml
	src/main/resources/META-INF/persistence.xml
	src/main/webapp/WEB-INF/JSP/cursussen/metnaam.jsp
	src/main/webapp/WEB-INF/JSP/index.jsp

Change-Id: I8a2fc1a5e70d4756ce1f9f0285837ef144be712c
Docent-Campus associatie

Change-Id: I408722af6c3205a1d436a7ebdf63ed5832c8757f
Merge branch 'master' of https://github.com/LisaMM/JPAHibernate.git

Conflicts:
	src/main/java/be/vdab/dao/DocentDAO.java
	src/main/java/be/vdab/entities/Campus.java
	src/main/java/be/vdab/entities/Docent.java
	src/main/java/be/vdab/exceptions/EmailAdresAlInGebruikException.java
	src/main/java/be/vdab/services/DocentService.java
	src/main/java/be/vdab/servlets/DocentToevoegenServlet.java
	src/main/resources/META-INF/orm.xml
	src/main/webapp/WEB-INF/JSP/docenten/toevoegen.jsp

Change-Id: I8057e73f8d1b8488cf4104e5ea6eed8c34b34004
Merge branch 'master' of https://github.com/LisaMM/JPAHibernate