Test
Merge branch 'dev' of https://github.com/dsarkozi/care4care-sdp-grp4.git
into dev

Conflicts:
	Care4Care/C4CApplication/unit_tests/JobTest.py