Merge branch 'master' of https://github.com/MTPL/TestRep

Conflicts:
	mtpl.txt
Merge branch 'master' of https://github.com/MTPL/TestRep