Added org membership check for users in principals endpoint
Changes for OSC compatibility
Changes for splitting off principal ejson by OSC/OPC
Merge branch 'master' of github.com:opscode/chef_wm

Conflicts:
	src/chef_wm_base.erl