Further expanded load function; Now adds studies!
Merge branch 'plusprojectfiles' of https://github.com/koencas/Se-Groep7 into plusprojectfiles

Conflicts:
	src/se2014/BoxController.java
[PANIC MODE ACTIVE]