user auth
Merge branch 'master' of https://github.com/leovanalphen/centrica

Conflicts:
	app/controllers/Configuratie.php
	app/controllers/Kennisdatabank.php
	app/controllers/problems.php
	app/models/ConfiguratieItems.php
	app/models/Incident.php
	app/models/Problem.php
	app/models/User.php
	app/models/kennisdb.php
	app/views/configuratie/create.php
	app/views/configuratie/index.php
	app/views/configuratie/listHW.php
	app/views/configuratie/listSW.php
	app/views/kennisbank/Kennisdatabank.php
	app/views/layouts/header.php
	app/views/problems/create.php
	app/views/problems/list.php
	app/views/users/list.php