added bootstrap
merging application.conf