SAM 1.3 changes to login and rest
SAM-specific changes to test cases
system group cleanup
fixed system groups test
ignore .nrepl-port
latest sam fixes
latest SAM fixes for Sauce
spec changes for sauce-labs
Merge branch 'wd-sam-1.3' into wd-merge

Conflicts:
	src/katello.clj
	src/katello/activation_keys.clj
	src/katello/conf.clj
	src/katello/setup.clj
	src/katello/tests/content_views.clj
	src/katello/tests/distributors.clj
	src/katello/tests/permissions.clj
	src/katello/tests/promotions.clj
	src/katello/tests/suite.clj
	src/katello/ui_common.clj
Merge branch 'wd-merge' of https://github.com/RedHatQE/katello.auto into wd-merge

Conflicts:
	src/katello/organizations.clj
	src/katello/setup.clj
	src/katello/tests/permissions.clj
	src/katello/ui_common.clj
	src/katello/users.clj
	src/webdriver.clj
cleaned up a few merge mistakes and factored out boilerplate in distributor menus
fixed a ContentView mistake
indentation fix
Merge branch 'wd-merge' of https://github.com/RedHatQE/katello.auto into wd-merge

Conflicts:
	src/katello/conf.clj
removed two functions that had previously been deleted
Merge pull request #893 from blrm/wd-merge

Wd merge