application.conf
new application.conf
Merge branch 'master' of https://github.com/jool49/sugarbind.git

Conflicts