Added ActiveMQ Detector (#133)
Implemented expression replacement in discovery URL (#132)
Updated documentation for agentUrl vars (#134)
Merge branch 'master' into 2.0

Conflicts:
	agent/core/src/main/java/org/jolokia/detector/ServerDetector.java
	agent/core/src/main/resources/META-INF/detectors-default
	agent/jvm/src/main/java/org/jolokia/jvmagent/JolokiaServer.java
	server/core/src/main/java/org/jolokia/server/core/http/AgentServlet.java
	server/core/src/main/java/org/jolokia/server/core/util/NetworkUtil.java