Nieuwe mappenstructuur (Application en Webservice)
Merge branch 'master' of https://github.com/denvers/DRIS

* 'master' of https://github.com/denvers/DRIS:
  Nieuwe mappenstructuur (Application en Webservice)

Conflicts:
	Application/log.roo
	Application/pom.xml
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/AfslagController.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/AfslagController_Roo_Controller.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/AfsluitingController.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/AfsluitingController_Roo_Controller.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/ApplicationConversionServiceFactoryBean.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/BelemmeringController.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/BelemmeringController_Roo_Controller.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/PlaatsController.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/PlaatsController_Roo_Controller.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/RouteController.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/RouteController_Roo_Controller.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/VerbindingController.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/VerbindingController_Roo_Controller.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/WerkzaamheidController.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/controllers/WerkzaamheidController_Roo_Controller.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afslag.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afslag_Roo_Configurable.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afslag_Roo_JavaBean.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afslag_Roo_Jpa_ActiveRecord.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afslag_Roo_Jpa_Entity.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afslag_Roo_ToString.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afsluiting.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afsluiting_Roo_Configurable.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afsluiting_Roo_Jpa_ActiveRecord.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afsluiting_Roo_Jpa_Entity.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Afsluiting_Roo_ToString.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Belemmering.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Belemmering_Roo_Configurable.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Belemmering_Roo_JavaBean.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Belemmering_Roo_Jpa_ActiveRecord.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Belemmering_Roo_Jpa_Entity.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Belemmering_Roo_ToString.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Plaats.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Plaats_Roo_Configurable.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Plaats_Roo_JavaBean.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Plaats_Roo_Jpa_ActiveRecord.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Plaats_Roo_Jpa_Entity.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Plaats_Roo_ToString.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Route.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Route_Roo_Configurable.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Route_Roo_JavaBean.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Route_Roo_Jpa_ActiveRecord.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Route_Roo_Jpa_Entity.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Route_Roo_ToString.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Verbinding.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Verbinding_Roo_Configurable.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Verbinding_Roo_JavaBean.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Verbinding_Roo_Jpa_ActiveRecord.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Verbinding_Roo_Jpa_Entity.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Verbinding_Roo_ToString.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Werkzaamheid.java
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Werkzaamheid_Roo_Configurable.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Werkzaamheid_Roo_JavaBean.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Werkzaamheid_Roo_Jpa_ActiveRecord.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Werkzaamheid_Roo_Jpa_Entity.aj
	Application/src/main/java/nl/ica/ddoa/dda/dris/model/Werkzaamheid_Roo_ToString.aj
	Application/src/main/resources/META-INF/persistence.xml
	Application/src/main/resources/META-INF/spring/applicationContext.xml
	Application/src/main/resources/META-INF/spring/database.properties
	Application/src/main/resources/log4j.properties
	Application/src/main/webapp/WEB-INF/classes/alt.properties
	Application/src/main/webapp/WEB-INF/classes/standard.properties
	Application/src/main/webapp/WEB-INF/i18n/application.properties
	Application/src/main/webapp/WEB-INF/i18n/messages.properties
	Application/src/main/webapp/WEB-INF/layouts/default.jspx
	Application/src/main/webapp/WEB-INF/layouts/layouts.xml
	Application/src/main/webapp/WEB-INF/spring/webmvc-config.xml
	Application/src/main/webapp/WEB-INF/tags/form/create.tagx
	Application/src/main/webapp/WEB-INF/tags/form/dependency.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/column.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/display.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
	Application/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
	Application/src/main/webapp/WEB-INF/tags/form/find.tagx
	Application/src/main/webapp/WEB-INF/tags/form/list.tagx
	Application/src/main/webapp/WEB-INF/tags/form/show.tagx
	Application/src/main/webapp/WEB-INF/tags/form/update.tagx
	Application/src/main/webapp/WEB-INF/tags/menu/category.tagx
	Application/src/main/webapp/WEB-INF/tags/menu/item.tagx
	Application/src/main/webapp/WEB-INF/tags/menu/menu.tagx
	Application/src/main/webapp/WEB-INF/tags/util/language.tagx
	Application/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx
	Application/src/main/webapp/WEB-INF/tags/util/pagination.tagx
	Application/src/main/webapp/WEB-INF/tags/util/panel.tagx
	Application/src/main/webapp/WEB-INF/tags/util/placeholder.tagx
	Application/src/main/webapp/WEB-INF/tags/util/theme.tagx
	Application/src/main/webapp/WEB-INF/views/afslags/create.jspx
	Application/src/main/webapp/WEB-INF/views/afslags/list.jspx
	Application/src/main/webapp/WEB-INF/views/afslags/show.jspx
	Application/src/main/webapp/WEB-INF/views/afslags/update.jspx
	Application/src/main/webapp/WEB-INF/views/afslags/views.xml
	Application/src/main/webapp/WEB-INF/views/afsluitings/create.jspx
	Application/src/main/webapp/WEB-INF/views/afsluitings/list.jspx
	Application/src/main/webapp/WEB-INF/views/afsluitings/show.jspx
	Application/src/main/webapp/WEB-INF/views/afsluitings/update.jspx
	Application/src/main/webapp/WEB-INF/views/afsluitings/views.xml
	Application/src/main/webapp/WEB-INF/views/belemmerings/create.jspx
	Application/src/main/webapp/WEB-INF/views/belemmerings/list.jspx
	Application/src/main/webapp/WEB-INF/views/belemmerings/show.jspx
	Application/src/main/webapp/WEB-INF/views/belemmerings/update.jspx
	Application/src/main/webapp/WEB-INF/views/belemmerings/views.xml
	Application/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx
	Application/src/main/webapp/WEB-INF/views/footer.jspx
	Application/src/main/webapp/WEB-INF/views/header.jspx
	Application/src/main/webapp/WEB-INF/views/index-template.jspx
	Application/src/main/webapp/WEB-INF/views/index.jspx
	Application/src/main/webapp/WEB-INF/views/menu.jspx
	Application/src/main/webapp/WEB-INF/views/plaatses/create.jspx
	Application/src/main/webapp/WEB-INF/views/plaatses/list.jspx
	Application/src/main/webapp/WEB-INF/views/plaatses/show.jspx
	Application/src/main/webapp/WEB-INF/views/plaatses/update.jspx
	Application/src/main/webapp/WEB-INF/views/plaatses/views.xml
	Application/src/main/webapp/WEB-INF/views/resourceNotFound.jspx
	Application/src/main/webapp/WEB-INF/views/routes/create.jspx
	Application/src/main/webapp/WEB-INF/views/routes/list.jspx
	Application/src/main/webapp/WEB-INF/views/routes/show.jspx
	Application/src/main/webapp/WEB-INF/views/routes/update.jspx
	Application/src/main/webapp/WEB-INF/views/routes/views.xml
	Application/src/main/webapp/WEB-INF/views/uncaughtException.jspx
	Application/src/main/webapp/WEB-INF/views/verbindings/create.jspx
	Application/src/main/webapp/WEB-INF/views/verbindings/list.jspx
	Application/src/main/webapp/WEB-INF/views/verbindings/show.jspx
	Application/src/main/webapp/WEB-INF/views/verbindings/update.jspx
	Application/src/main/webapp/WEB-INF/views/verbindings/views.xml
	Application/src/main/webapp/WEB-INF/views/views.xml
	Application/src/main/webapp/WEB-INF/views/werkzaamheids/create.jspx
	Application/src/main/webapp/WEB-INF/views/werkzaamheids/list.jspx
	Application/src/main/webapp/WEB-INF/views/werkzaamheids/show.jspx
	Application/src/main/webapp/WEB-INF/views/werkzaamheids/update.jspx
	Application/src/main/webapp/WEB-INF/views/werkzaamheids/views.xml
	Application/src/main/webapp/WEB-INF/web.xml
	Application/src/main/webapp/images/add.png
	Application/src/main/webapp/images/banner-graphic.png
	Application/src/main/webapp/images/create.png
	Application/src/main/webapp/images/delete.png
	Application/src/main/webapp/images/en.png
	Application/src/main/webapp/images/favicon.ico
	Application/src/main/webapp/images/list.png
	Application/src/main/webapp/images/resultset_first.png
	Application/src/main/webapp/images/resultset_last.png
	Application/src/main/webapp/images/resultset_next.png
	Application/src/main/webapp/images/resultset_previous.png
	Application/src/main/webapp/images/show.png
	Application/src/main/webapp/images/springsource-logo.png
	Application/src/main/webapp/images/update.png
	Application/src/main/webapp/styles/alt.css
	Application/src/main/webapp/styles/standard.css
	Application/target/classes/META-INF/aop-ajc.xml
	Application/target/classes/META-INF/persistence.xml
	Application/target/classes/META-INF/spring/applicationContext.xml
	Application/target/classes/META-INF/spring/database.properties
	Application/target/classes/log4j.properties
	Application/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	Application/target/m2e-wtp/web-resources/META-INF/maven/nl.ica.ddoa.dda.dris/DRIS/pom.properties
	Application/target/m2e-wtp/web-resources/META-INF/maven/nl.ica.ddoa.dda.dris/DRIS/pom.xml