Updated to match current working set with COE changes + THINCLIENT
Merge branch 'master' of https://github.com/seanmcadam/nac

Conflicts:
	lib/NAC/ConfigDB.pm
	lib/Radius/AuthNAC2.pm