Adjusted URI patterns; made <link> respond to new patterns;  and fixed
ExportFilter Bugs
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java

Conflicts:
	src/main/java/org/energyos/espi/common/service/impl/SubscriptionServiceImpl.java