my gemset
fix merge
Merge branch 'master' of github.com:phoenix-scitent/okm
Merge branch 'master' of github.com:phoenix-scitent/okm
updated code to make activation work
updated concerns