Merge branch 'master' of https://github.com/dfcoffin/OpenESPI-Common-java into dfcoffin-master

Conflicts:
	src/main/java/org/energyos/espi/common/service/impl/SubscriptionServiceImpl.java
Merge pull request #41 from energyos/dfcoffin-master

Dfcoffin master
removed merge tags
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java

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