Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/cjapes/jira-wsdl

Conflicts:
	lib/jira-wsdl.rb
Merge branch 'master' of https://github.com/cjapes/jira-wsdl into cjapes-master

Conflicts:
	features/step_definitions/Jira_steps.rb
	lib/jira-wsdl.rb
Merge branch 'master' of https://github.com/cjapes/jira-wsdl into cjapes-master

Conflicts:
	features/step_definitions/Jira_steps.rb
	lib/jira-wsdl.rb