consistent help labels
closes #38 and #32
merged
adjust configuration to have a second SOS instance available
 * delete timeseries.jsp (old test file)
 * rename file
enhabnce enforcementpoint clas to be used for convenience configuration
use enhanced enforcement point setup
merging changes regarding to enforcement point enhancements
Merge branch 'merge_dushyant' into develop