correcting an error in editing form for content rules.  wasn't showing correct values for servers
Start login process
merge in master