Vendor information
Merge branch 'master' of https://github.com/nkalyankar/ntoss

Conflicts:
	dashboard.php
	settings.php