Merge pull request #408 from bartcharbon/master

added users "datamanager" and "researcher" for lifelines + do not store "admin" password in source
Fix for github issue #383 ElasticSearchService create mapping fails if data set name contains # bug
Merge pull request #410 from erwinwinder/master

Fix for github issue #383