Merge remote-tracking branch 'origin/merge-pages'
Merge branch 'merge-pages' of github.com:phoenix-scitent/okm
Merge branch 'master' of github.com:phoenix-scitent/okm
fix gemfile
update gemfile
namespaced certain ruby_objects for better organization and completed revoke actions
Merge branch 'master' of github.com:phoenix-scitent/okm

Conflicts:
	Gemfile
	Gemfile.lock
something
gemfilelock fixed
refactored revoke and change_sub_group.  completed with tests
Merge branch 'master' of github.com:phoenix-scitent/okm
gemfile.schlock
merges with master