fixing a bug by replacing code with web service call [KFSQA-1013]
fixing a bug by replacing code with web service call [KFSQA-1014]
Merge branch 'master' into KFSQA-1014

Conflicts:
	features/step_definitions/vendor/vendor.rb
fixing a bug by replacing code with web service call [KFSQA-1014]
Merge branch 'master' into KFSQA-1014
fixing a bug by replacing code with web service call [KFSQA-1014]
Merge branch 'master' into KFSQA-1014
fixing a bug by replacing code with web service call [KFSQA-1014]
vendor edit working [KFSQA-1014]
Merge branch 'master' into KFSQA-1014
smoke test working [KFSQA-1014]
smoke test working [KFSQA-1014]
Typo on final then statement [KFSQA-1014]
removing wip
[KFSQA-1043] merge from master