finish link patch with lab

Signed-off-by: Raeef Refai <raeef.refai@gmail.com>
Merge branch 'master' of https://github.com/raeefrefai/adrr

Conflicts:
	src/app/wrapper/eng/labForm.tpl.html