lots of changes, pulling after a while
adding merge changes
 security work
 security work querywid not working
 security work working version
 saved work for security
 starting work for security screens, added config.js to .gitignore