lavet så den ikke længere åbner modal før tablecontent er sat
corrected so it checks on the right name
fixed so timer works, and status are updated properly
Merge remote-tracking branch 'origin/protoBranch' into development
Merge branch 'development' of https://github.com/christianokeeffe/sw703e14 into development

Conflicts:
	js/controllers/mainController.js