Corrected paths
Merge branch 'master' of github.com:ngi-automation/thruplex

Conflicts:
	LICENSE