added approval checks to json serialize. #94
added filter for project type
updated test scenarios
added file upload #90
Merge branch 'f/jsonserialize_bugfix' into f/mergeExcelJsonFilter
Merge branch 'f/ExcelUpload' into f/mergeExcelJsonFilter
test scenarios updated
Create 14-05-14
Rename 14-05-14 to 14-05-14 jelle.md
Update 14-05-14 jelle.md
review verwerkt
Merge branch 'dev' into f/mergeExcelJsonFilter

Conflicts:
	Classes/PROJ/Controllers/ManagementController.php
	Classes/PROJ/Views/Management.phtml
	Classes/PROJ/Views/Partial/TopJsIncludes.phtml
	Doc/Test Scenarios.md