Added exchange durable option to exchange config options, x-expires to queue config options
Merge branch 'master' of github.com:jlavallee/JMeter-Rabbit-AMQP

Conflicts:
	src/main/com/zeroclue/jmeter/protocol/amqp/AMQPSampler.java
	src/main/com/zeroclue/jmeter/protocol/amqp/gui/AMQPSamplerGui.java