Merge pull request #7 from Wuisch/dirk

Dirk
stupid
Merge branch 'master' of https://github.com/Wuisch/IPSEN5 into document

Conflicts:
	.idea/workspace.xml
Merge pull request #10 from Wuisch/dirk

Work work
Dinges
Merge pull request #11 from Wuisch/update-UserController

Dinges
Gitignore update om composer te updaten
Merge branch 'master' into dirk
Merge pull request #12 from Wuisch/dirk

Work on migrations
Create document page
Merge branch 'master' of https://github.com/Wuisch/IPSEN5
Fixed dirks fails
Merge branch 'master' into dirk