added refreshtoken support to EspiTokenEnhancer
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/oauth/EspiTokenEnhancer.java
Coding complete on Bulk feature
Bulk Support for 1.2 RC 1
MeterReadingService cleanup
implemented /manage?command=xxxx for DB reset and initialzation
Merge pull request #139 from jateeter/master

Bulk Complete for 1.2 RC1 - I went ahead and merged this pull request in.