testlogin
home template
loginlogout
25-03 login
mergeconflict opgelost
25-03 met DB
26-03 start
26-03 twee
userdao 26-03
26-03 dao, service
casesens
premerge
Merge branch 'master' into bram

Conflicts:
	src/Framework/AbstractController.php
	src/Framework/AbstractFramework.php
	src/Framework/Application.php
	src/Framework/Dispatcher.php
	src/Framework/Helper.php
	src/Framework/abstractcontroller.php
	src/Framework/abstractframework.php
	src/Framework/application.php
	src/Framework/dispatcher.php
	src/Framework/helper.php
	src/Mctesting/Model/service/UserService.php
	src/Mctesting/Model/service/UsergroupService.php
	src/framework/abstractcontroller.php
	src/framework/abstractframework.php
	src/framework/application.php
	src/framework/dispatcher.php
	src/framework/helper.php
conflicts
Merge branch 'bram' into logintest

Conflicts:
	src/Framework/Application.php
	src/Mctesting/Model/Data/UsergroupDAO.php
works ....
opmaak hendrik
helperfix
home & layout template revised
Merge remote-tracking branch 'origin/logintest' into logintest