added settings merge
2.5.1
Merge branch 'master' of github.com:viaplay/simple-ioc