updated AddUser class to allow for user data update without cascading deletes
replaced single sql call with 2.  on duplicate key update behavior undefined for multiple keys
Merge branch 'master' of 10.10.16.2:/srv/git/simiangrid
Merge branch 'master' of https://github.com/intelvwi/simiangrid
Merge branch 'master' of https://github.com/intelvwi/simiangrid
Merge https://github.com/intelvwi/simiangrid
modified AddIdentity adding optional Enabled parameter, which allows us to disable identities through the api
modified AddIdentity adding optional Enabled parameter, which allows us to disable identities through the api
merge master