messed up
Merge branch 'PrigsBranch' of https://github.com/ckhajavi/MI5 into PrigsBranch

Conflicts:
	VDMS.pro.user