tests passing
Merge branch 'master' of github.com:phoenix-scitent/okm
added tests for new activate! functionality
add sync_user and sync_product api endpoints
completed Key#import with tests
completed Key#import with tests
Merge branch 'master' of github.com:phoenix-scitent/okm

Conflicts:
	app/controllers/keys_controller.rb
merging in merge-pages
fix sync_products and sync_users
Merge branch 'master' of github.com:phoenix-scitent/okm
fix
updated filters