Fixes subscription test.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/org/atmosphere/cpr/StompInterceptorTest.java