server updates
deploy
updated code to work on server
Merge branch 'master' of github.com:phoenix-scitent/okm
updated concerns