Refactored code and fixed tab clicks
Merge remote-tracking branch 'origin/master' into servicecatalogs

Conflicts:
	pages/automate.py
	pages/services.py
	pages/services_subpages/catalog_subpages/catalog_items.py
	tests/test_catalog.py