first merge from NJ7
SecSettings
merge 2 of NJ7
build fixes
v2.0 testing