Merge pull request #4 from Wuisch/jasper

Documents added
git ignore update
Merge pull request #5 from Wuisch/jasper

begin with document creation
Merge pull request #6 from Wuisch/document

Document validation
Fix document upload form
poging gitignore werkend
probeersel
Merge branch 'master' of https://github.com/Wuisch/IPSEN5

Conflicts:
	.idea/workspace.xml
Add .idea folder to gitignore
Remove .idea folder
Merge commit 'bcc5fe89a70a715a0381ff261f22f228827fce68' into dirk

Conflicts:
	.idea/workspace.xml
Merge branch 'master' into dirk

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

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

Conflicts:
	.idea/workspace.xml
Use beforeFilters to check permissions
Add post route
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