minor stuff
Merge branch 'master' of github.com:adnanh/qa
Merge branch 'master' of github.com:adnanh/qa

Conflicts:
	app/controllers/soap_controller.rb
soap finished
Merge branch 'master' of github.com:adnanh/qa

Conflicts:
	app/controllers/soap_controller.rb