closes #40, closes #78
Merge remote-tracking branch 'origin/master'

Conflicts:
	automaatnehindaja/Backend/testService.py