Merge branch 'srecords'
User can be granted all rights for a single organization
Merge branch 'master' into all-rights

Conflicts:
	src/katello/tests/permissions.clj
Merge branch 'master' of git://github.com/RedHatQE/katello.auto
consume content from cloned content view definition
fixed the extra braces
calling 'published-name' from cv definition instead of defining it as a seperate var
Merge pull request #739 from kbidarkar/all-rights

User can be granted all rights for a single organization
Merge pull request #742 from sghai/srecords

Consume content from cloned content-view definition
Update page and locator data, splittable between headpin and katello

Can now specify that pages or locators are for headpin, katello, or either.  You can switch servers at the repl "live" and it should 'just work' because it caches per-url whether it is a katello or headpin server (asking via api if it hasn't asked that server before).  The only way this will fail is if a hostname is reinstalled and changed to a different deployment while the repl is still up.  If that happens you can just do (require 'katello.rest :reload) to reset the cache.
Merge pull request #746 from weissjeffm/headpin-nav-squashed

Update page and locator data, splittable between headpin and katello